From 6724220d3e5efb88be00ff3b18cb8bf323bf2156 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 6 Sep 2022 22:44:23 +0100 Subject: [PATCH 1/2] Fixed whitespace for docblocks --- app/code/core/Mage/Admin/Helper/Block.php | 3 --- app/code/core/Mage/Admin/Helper/Variable.php | 5 +---- .../core/Mage/Admin/Model/Acl/Assert/Time.php | 2 +- .../core/Mage/Admin/Model/Acl/Role/User.php | 2 +- .../core/Mage/Admin/Model/Mysql4/User.php | 2 +- .../core/Mage/Admin/Model/Resource/Block.php | 3 --- .../core/Mage/Admin/Model/Resource/Roles.php | 4 ---- .../core/Mage/Admin/Model/Resource/User.php | 8 +------ .../Mage/Admin/Model/Resource/Variable.php | 11 +--------- app/code/core/Mage/Admin/Model/User.php | 2 +- app/code/core/Mage/Admin/Model/Variable.php | 6 ++++- app/code/core/Mage/Admin/etc/config.xml | 2 +- .../admin_setup/upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../admin_setup/upgrade-1.6.1.0-1.6.1.1.php | 2 +- .../admin_setup/upgrade-1.6.1.1-1.6.1.2.php | 2 +- .../admin_setup/upgrade-1.6.1.2-1.6.1.3.php | 2 +- .../Mage/AdminNotification/etc/adminhtml.xml | 2 +- .../Mage/AdminNotification/etc/config.xml | 2 +- .../Mage/AdminNotification/etc/system.xml | 10 ++++----- .../Adminhtml/Block/Api/Role/Grid/User.php | 5 +---- .../Adminhtml/Block/Api/Tab/Userroles.php | 10 ++++++--- .../core/Mage/Adminhtml/Block/Api/User.php | 3 +-- .../Block/Api/User/Edit/Tab/Roles.php | 6 ++--- .../Adminhtml/Block/Api/User/Edit/Tabs.php | 2 +- .../core/Mage/Adminhtml/Block/Api/Users.php | 4 +--- .../Catalog/Category/Checkboxes/Tree.php | 4 +++- .../Adminhtml/Block/Catalog/Category/Tabs.php | 2 +- .../Adminhtml/Block/Catalog/Category/Tree.php | 3 +-- .../Form/Renderer/Attribute/Urlkey.php | 3 +-- .../Form/Renderer/Config/YearRange.php | 3 +-- .../Block/Catalog/Helper/Form/Wysiwyg.php | 2 +- .../Product/Attribute/Edit/Tab/System.php | 5 +---- .../Catalog/Product/Attribute/Edit/Tabs.php | 4 +--- .../Product/Attribute/Set/Toolbar/Add.php | 2 -- .../Edit/Action/Attribute/Tab/Websites.php | 2 +- .../Product/Edit/Action/Attribute/Tabs.php | 2 +- .../Catalog/Product/Edit/Tab/Alerts/Stock.php | 2 +- .../Product/Edit/Tab/Options/Type/Text.php | 3 +-- .../Catalog/Product/Edit/Tab/Price/Tier.php | 6 +---- .../Catalog/Product/Edit/Tab/Settings.php | 2 +- .../Product/Edit/Tab/Super/Config/Simple.php | 2 +- .../Product/Edit/Tab/Super/Settings.php | 3 +-- .../Block/Catalog/Product/Edit/Tab/Tag.php | 3 +-- .../Block/Catalog/Product/Edit/Tab/Upsell.php | 3 +-- .../Catalog/Product/Edit/Tab/Websites.php | 5 +---- .../Block/Catalog/Product/Edit/Tabs.php | 2 +- .../Product/Frontend/Product/Watermark.php | 2 +- .../Catalog/Product/Helper/Form/Weight.php | 2 +- .../Adminhtml/Block/Cms/Page/Edit/Tabs.php | 3 +-- .../Block/Cms/Wysiwyg/Images/Content.php | 2 -- .../Cms/Wysiwyg/Images/Content/Uploader.php | 5 +---- .../Block/Cms/Wysiwyg/Images/Tree.php | 3 +-- .../Block/Customer/Edit/Renderer/Region.php | 2 -- .../Tab/Newsletter/Grid/Filter/Status.php | 4 +--- .../Tab/Newsletter/Grid/Renderer/Status.php | 4 +--- .../Adminhtml/Block/Customer/Edit/Tab/Tag.php | 3 +-- .../Block/Customer/Edit/Tab/Tags.php | 3 +-- .../Block/Customer/Edit/Tab/View.php | 3 +-- .../Block/Customer/Edit/Tab/View/Wishlist.php | 5 +---- .../Block/Customer/Edit/Tab/Wishlist.php | 2 +- .../Adminhtml/Block/Customer/Edit/Tabs.php | 3 +-- .../Customer/Online/Grid/Renderer/Type.php | 4 +--- .../Customer/Online/Grid/Renderer/Url.php | 2 +- .../Sales/Order/Address/Form/Renderer/Vat.php | 2 +- .../Customer/System/Config/Validatevat.php | 2 +- .../core/Mage/Adminhtml/Block/Dashboard.php | 6 ++--- .../Block/Dashboard/Searches/Top.php | 3 +-- .../Block/Dashboard/Tab/Products/Viewed.php | 4 +--- .../Mage/Adminhtml/Block/Dashboard/Totals.php | 2 +- .../Mage/Adminhtml/Block/Media/Uploader.php | 9 +------- .../Adminhtml/Block/Newsletter/Subscriber.php | 10 +-------- .../Subscriber/Grid/Filter/Website.php | 4 +--- .../Adminhtml/Block/Newsletter/Template.php | 3 +-- .../Notification/Grid/Renderer/Severity.php | 2 +- .../Adminhtml/Block/Notification/Toolbar.php | 5 +++-- .../Adminhtml/Block/Notification/Window.php | 7 +++++- .../Adminhtml/Block/Permissions/Block.php | 3 --- .../Block/Permissions/Block/Edit.php | 3 --- .../Block/Permissions/Block/Grid.php | 3 --- .../Adminhtml/Block/Permissions/Grid/User.php | 4 +--- .../Block/Permissions/Role/Grid/User.php | 4 +--- .../Block/Permissions/Tab/Useredit.php | 10 ++++++--- .../Block/Permissions/Tab/Userroles.php | 10 ++++++--- .../Mage/Adminhtml/Block/Permissions/User.php | 5 +---- .../Block/Permissions/User/Edit/Tabs.php | 3 +-- .../Block/Permissions/Usernroles.php | 13 +++++++---- .../Adminhtml/Block/Permissions/Users.php | 4 +--- .../Adminhtml/Block/Permissions/Variable.php | 5 +---- .../Block/Permissions/Variable/Edit.php | 3 --- .../Mage/Adminhtml/Block/Poll/Edit/Tabs.php | 3 +-- .../Block/Promo/Catalog/Edit/Form.php | 2 -- .../Promo/Catalog/Edit/Tab/Conditions.php | 2 -- .../Block/Promo/Catalog/Edit/Tabs.php | 6 +---- .../Adminhtml/Block/Promo/Quote/Edit/Form.php | 2 -- .../Block/Promo/Quote/Edit/Tab/Conditions.php | 2 -- .../Tab/Coupons/Grid/Column/Renderer/Used.php | 2 +- .../Adminhtml/Block/Promo/Quote/Edit/Tabs.php | 6 +---- .../Block/Promo/Widget/Chooser/Sku.php | 2 +- .../Mage/Adminhtml/Block/Rating/Edit/Tabs.php | 12 ++-------- .../core/Mage/Adminhtml/Block/Rating/Grid.php | 2 -- .../Report/Config/Form/Field/YtdStart.php | 3 +-- .../Block/Report/Customer/Totals.php | 3 +-- .../Adminhtml/Block/Report/Grid/Shopcart.php | 2 +- .../Adminhtml/Block/Report/Product/Sold.php | 3 +-- .../Adminhtml/Block/Report/Product/Viewed.php | 3 +-- .../Block/Report/Refresh/Statistics.php | 3 +-- .../Adminhtml/Block/Report/Sales/Shipping.php | 3 +-- .../Mage/Adminhtml/Block/Report/Sales/Tax.php | 3 +-- .../Mage/Adminhtml/Block/Report/Wishlist.php | 4 +--- .../Block/Review/Grid/Filter/Type.php | 3 +-- .../Block/Review/Grid/Renderer/Type.php | 3 +-- .../Adminhtml/Block/Review/Rating/Summary.php | 3 +-- .../Block/Sales/Order/Comments/View.php | 2 +- .../Block/Sales/Order/Create/Sidebar.php | 3 +-- .../Sales/Order/Create/Sidebar/Viewed.php | 4 +--- .../Sales/Order/Create/Sidebar/Wishlist.php | 2 +- .../Block/Sales/Order/Create/Store.php | 4 +--- .../Block/Sales/Order/Create/Totals.php | 3 +-- .../Sales/Order/Create/Totals/Shipping.php | 7 +++--- .../Sales/Order/Create/Totals/Subtotal.php | 6 +++-- .../Block/Sales/Order/Create/Totals/Table.php | 5 +---- .../Block/Sales/Order/Create/Totals/Tax.php | 6 +++-- .../Block/Sales/Order/Creditmemo/Totals.php | 2 +- .../Block/Sales/Order/Creditmemo/View.php | 2 +- .../Sales/Order/Invoice/Create/Tracking.php | 2 +- .../Block/Sales/Order/Invoice/Totals.php | 2 +- .../Block/Sales/Order/Invoice/View.php | 2 +- .../Sales/Order/Shipment/Create/Tracking.php | 2 +- .../Block/Sales/Order/Shipment/View.php | 2 +- .../Sales/Order/Shipment/View/Tracking.php | 2 +- .../Adminhtml/Block/Sales/Order/Status.php | 2 +- .../Adminhtml/Block/Sales/Order/Totalbar.php | 3 +-- .../Adminhtml/Block/Sales/Order/Totals.php | 2 +- .../Block/Sales/Order/Totals/Tax.php | 2 +- .../Mage/Adminhtml/Block/Sales/Order/View.php | 2 +- .../Block/Sales/Order/View/Tab/Shipments.php | 2 +- .../Sales/Order/View/Tab/Transactions.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Tabs.php | 2 +- .../Mage/Adminhtml/Block/Sales/Shipment.php | 4 +--- .../Mage/Adminhtml/Block/Sales/Totals.php | 7 +++++- .../Adminhtml/Block/Sales/Transactions.php | 2 +- .../core/Mage/Adminhtml/Block/Sitemap.php | 5 ++--- .../Block/Sitemap/Grid/Renderer/Time.php | 3 ++- .../Mage/Adminhtml/Block/Store/Switcher.php | 2 +- .../Config/Form/Fieldset/Order/Statuses.php | 8 +++++-- .../Block/System/Config/Switcher.php | 7 +++++- .../System/Storage/Media/Synchronize.php | 2 +- .../Adminhtml/Block/System/Config/Tabs.php | 4 +--- .../System/Convert/Gui/Edit/Tab/Upload.php | 3 +-- .../System/Convert/Gui/Edit/Tab/View.php | 2 +- .../System/Convert/Gui/Edit/Tab/Wizard.php | 4 +--- .../Block/System/Convert/Gui/Edit/Tabs.php | 5 +---- .../System/Convert/Profile/Edit/Tabs.php | 5 +---- .../Block/System/Currency/Edit/Tabs.php | 2 +- .../Block/System/Design/Edit/Tabs.php | 7 +++++- .../Adminhtml/Block/System/Email/Template.php | 4 +--- .../Email/Template/Grid/Filter/Type.php | 3 +-- .../Email/Template/Grid/Renderer/Type.php | 3 +-- .../Block/System/Store/Delete/Website.php | 4 +--- .../Block/System/Store/Grid/Render/Store.php | 3 +-- .../System/Store/Grid/Render/Website.php | 5 +---- .../Adminhtml/Block/System/Store/Store.php | 3 +-- .../Adminhtml/Block/System/Store/Tree.php | 2 +- .../Mage/Adminhtml/Block/System/Variable.php | 6 +---- app/code/core/Mage/Adminhtml/Block/Tag.php | 2 +- .../Adminhtml/Block/Tag/Store/Switcher.php | 2 +- .../core/Mage/Adminhtml/Block/Tag/Tag.php | 4 +--- .../Mage/Adminhtml/Block/Tax/Rate/Title.php | 6 +++-- .../core/Mage/Adminhtml/Block/Template.php | 2 +- .../core/Mage/Adminhtml/Block/Urlrewrite.php | 2 +- .../Block/Urlrewrite/Category/Tree.php | 2 +- app/code/core/Mage/Adminhtml/Block/Widget.php | 2 +- .../Block/Widget/Grid/Column/Filter/Store.php | 4 +--- .../Block/Widget/Grid/Column/Filter/Text.php | 2 +- .../Block/Widget/Grid/Column/Filter/Theme.php | 2 +- .../Widget/Grid/Column/Renderer/Store.php | 2 +- .../Widget/Grid/Column/Renderer/Text.php | 3 +-- .../Widget/Grid/Column/Renderer/Theme.php | 2 +- .../Widget/Grid/Column/Renderer/Wrapline.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Tabs.php | 6 +---- .../core/Mage/Adminhtml/Block/Widget/Tree.php | 7 +++++- .../Adminhtml/Controller/Sales/Shipment.php | 6 +++-- .../Mage/Adminhtml/Model/Email/Template.php | 3 +-- .../Model/LayoutUpdate/Validator.php | 5 +---- .../Model/Newsletter/Renderer/Text.php | 3 +-- .../System/Config/Backend/Admin/Usecustom.php | 2 +- .../Config/Backend/Admin/Usecustompath.php | 2 +- .../Config/Backend/Admin/Usesecretkey.php | 2 +- .../Config/Backend/Catalog/Search/Type.php | 2 +- .../Backend/Customer/Address/Street.php | 2 +- .../System/Config/Backend/Locale/Timezone.php | 2 +- .../Config/Backend/Shipping/Tablerate.php | 3 +-- .../Model/System/Config/Backend/Sitemap.php | 9 +++++--- .../Model/System/Config/Backend/Store.php | 2 +- .../Model/System/Config/Backend/Symlink.php | 7 +++--- .../Model/System/Config/Backend/Translate.php | 2 +- .../Config/Source/Catalog/Search/Type.php | 2 +- .../Config/Source/Catalog/TimeFormat.php | 7 +++++- .../Config/Source/Customer/Address/Type.php | 2 +- .../Model/System/Config/Source/Date/Short.php | 7 +++++- .../System/Config/Source/Email/Smtpauth.php | 7 +++++- .../System/Config/Source/Email/Template.php | 2 +- .../System/Config/Source/Locale/Timezone.php | 6 +++-- .../Config/Source/Locale/Weekdaycodes.php | 6 +++-- .../System/Config/Source/Locale/Weekdays.php | 6 +++-- .../System/Config/Source/Order/Status.php | 6 ++++- .../Model/System/Config/Source/Price/Step.php | 7 +++++- .../Config/Source/Product/Options/Type.php | 2 +- .../Config/Source/Product/Thumbnail.php | 3 ++- .../Config/Source/Shipping/Tablerate.php | 7 +++++- .../Config/Source/Shipping/Taxclass.php | 9 ++++++-- .../Config/Source/Storage/Media/Storage.php | 9 ++++---- .../Model/System/Config/Source/Store.php | 7 +++++- .../Model/System/Config/Source/Website.php | 7 +++++- .../Model/System/Config/Source/Yesno.php | 8 +++---- .../System/Config/Source/Yesnocustom.php | 9 ++++---- .../Mage/Adminhtml/Model/System/Store.php | 3 +-- app/code/core/Mage/Adminhtml/Model/Url.php | 8 ++++++- .../controllers/Api/UserController.php | 8 ++++++- .../Catalog/Category/WidgetController.php | 2 +- .../Catalog/Product/SetController.php | 2 +- .../Catalog/Product/WidgetController.php | 2 +- .../Cms/Block/WidgetController.php | 2 +- .../controllers/Cms/Page/WidgetController.php | 2 +- .../controllers/Cms/WysiwygController.php | 2 +- .../System/Config/ValidatevatController.php | 2 +- .../Product/Composite/WishlistController.php | 2 +- .../controllers/Media/UploaderController.php | 2 +- .../Newsletter/SubscriberController.php | 2 +- .../Newsletter/TemplateController.php | 4 ++-- .../Permissions/UserController.php | 8 ++++++- .../Permissions/VariableController.php | 2 +- .../controllers/Promo/WidgetController.php | 7 +++++- .../controllers/Report/ShopcartController.php | 2 +- .../Report/StatisticsController.php | 2 +- .../controllers/Report/TagController.php | 2 +- .../Sales/Order/ShipmentController.php | 2 +- .../Sales/Order/StatusController.php | 2 +- .../controllers/Sales/ShipmentController.php | 6 +++-- .../Sales/TransactionsController.php | 6 +++-- .../controllers/SitemapController.php | 3 ++- .../Config/System/StorageController.php | 2 +- .../System/Email/TemplateController.php | 2 +- .../controllers/System/StoreController.php | 3 +-- .../controllers/System/VariableController.php | 2 +- .../controllers/SystemController.php | 2 +- .../Adminhtml/controllers/TagController.php | 3 +-- .../Adminhtml/controllers/TaxController.php | 2 +- .../controllers/UrlrewriteController.php | 2 +- .../core/Mage/Adminhtml/etc/adminhtml.xml | 2 +- app/code/core/Mage/Adminhtml/etc/config.xml | 2 +- .../core/Mage/Adminhtml/etc/jstranslator.xml | 2 +- .../core/Mage/Api/Model/Acl/Assert/Time.php | 8 +++---- .../core/Mage/Api/Model/Acl/Role/User.php | 9 ++++---- app/code/core/Mage/Api/Model/Mysql4/User.php | 12 +++++----- .../core/Mage/Api/Model/Resource/User.php | 16 +++++--------- .../Mage/Api/Model/Server/Adapter/Soap.php | 6 ++--- .../Mage/Api/Model/Server/Adapter/Xmlrpc.php | 6 ++--- .../Mage/Api/Model/Server/V2/Adapter/Soap.php | 6 ++--- .../Api/Model/Server/Wsi/Adapter/Soap.php | 6 ++--- app/code/core/Mage/Api/Model/User.php | 21 ++++++------------ .../Mage/Api/controllers/SoapController.php | 6 ++--- .../Api/controllers/V2/SoapController.php | 6 ++--- .../Mage/Api/controllers/XmlrpcController.php | 6 ++--- app/code/core/Mage/Api/etc/adminhtml.xml | 2 +- app/code/core/Mage/Api/etc/api.xml | 2 +- app/code/core/Mage/Api/etc/config.xml | 2 +- app/code/core/Mage/Api/etc/system.xml | 10 ++++----- .../Mage/Api2/Block/Adminhtml/Attribute.php | 3 --- .../Block/Adminhtml/Attribute/Buttons.php | 3 --- .../Api2/Block/Adminhtml/Attribute/Tabs.php | 9 +++----- .../core/Mage/Api2/Block/Adminhtml/Roles.php | 3 --- .../Api2/Block/Adminhtml/Roles/Buttons.php | 3 --- .../Mage/Api2/Block/Adminhtml/Roles/Grid.php | 3 --- .../Api2/Block/Adminhtml/Roles/Tab/Users.php | 10 ++++----- .../Mage/Api2/Block/Adminhtml/Roles/Tabs.php | 11 ++++------ .../Mage/Api2/Model/Acl/Global/Rule/Tree.php | 6 ++--- app/code/core/Mage/Api2/Model/Auth/User.php | 12 +++++----- .../core/Mage/Api2/Model/Renderer/Xml.php | 6 ++--- .../Mage/Api2/Model/Renderer/Xml/Writer.php | 6 ++--- .../Api2/Model/Request/Interpreter/Xml.php | 12 +++++----- .../core/Mage/Api2/Model/Resource/Setup.php | 12 +++++----- .../Mage/Api2/Model/Resource/Validator.php | 6 ++--- app/code/core/Mage/Api2/etc/adminhtml.xml | 2 +- app/code/core/Mage/Api2/etc/config.xml | 2 +- .../Authorizenet/Model/Directpost/Session.php | 6 ++--- .../core/Mage/Authorizenet/etc/config.xml | 2 +- .../core/Mage/Authorizenet/etc/system.xml | 10 ++++----- app/code/core/Mage/Backup/Helper/Data.php | 6 ++--- .../Mage/Backup/Model/Config/Source/Type.php | 6 ++--- app/code/core/Mage/Backup/etc/adminhtml.xml | 2 +- app/code/core/Mage/Backup/etc/config.xml | 2 +- app/code/core/Mage/Backup/etc/system.xml | 10 ++++----- .../Product/Edit/Tab/Attributes/Special.php | 12 +++++----- .../Adminhtml/Catalog/Product/Edit/Tabs.php | 12 +++++----- .../Bundle/Block/Catalog/Product/View.php | 6 ++--- .../Bundle/Model/Mysql4/Indexer/Stock.php | 12 +++++----- .../Product/Attribute/Source/Price/View.php | 12 +++++----- .../core/Mage/Bundle/Model/Product/Type.php | 12 +++++----- .../Bundle/Model/Resource/Indexer/Stock.php | 12 +++++----- .../Mage/Bundle/Model/Resource/Option.php | 6 ----- .../Bundle/Model/Resource/Price/Index.php | 3 --- .../Mage/Bundle/Model/Resource/Selection.php | 4 ---- .../Model/Sales/Order/Pdf/Items/Shipment.php | 6 ++--- .../Source/Option/Selection/Price/Type.php | 6 ++--- .../Mage/Bundle/Model/Source/Option/Type.php | 6 ++--- app/code/core/Mage/Bundle/etc/config.xml | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 6 ++--- .../core/Mage/Captcha/Block/Captcha/Zend.php | 2 +- .../core/Mage/Captcha/Model/Resource/Log.php | 4 ---- app/code/core/Mage/Captcha/Model/Zend.php | 2 +- app/code/core/Mage/Captcha/etc/config.xml | 2 +- app/code/core/Mage/Captcha/etc/system.xml | 10 ++++----- .../core/Mage/Catalog/Block/Category/View.php | 8 +++---- .../core/Mage/Catalog/Block/Layer/State.php | 6 ++--- .../core/Mage/Catalog/Block/Layer/View.php | 12 +++++----- .../Catalog/Block/Product/Compare/Sidebar.php | 6 ++--- .../Catalog/Block/Product/List/Toolbar.php | 12 +++++----- .../Catalog/Block/Product/List/Upsell.php | 9 ++++---- .../Catalog/Block/Product/Price/Template.php | 12 +++++----- .../core/Mage/Catalog/Block/Product/View.php | 13 +++++------ .../Block/Product/View/Options/Type/Text.php | 7 +++--- .../Mage/Catalog/Block/Product/View/Tabs.php | 6 ++--- .../Block/Product/View/Type/Simple.php | 8 +++---- .../Block/Product/View/Type/Virtual.php | 9 ++++---- .../core/Mage/Catalog/Helper/Product/Url.php | 6 ++--- .../core/Mage/Catalog/Helper/Product/View.php | 10 +++++---- .../Api2/Product/Category/Rest/Admin/V1.php | 6 ++--- .../Product/Category/Rest/Customer/V1.php | 6 ++--- .../Api2/Product/Category/Rest/Guest/V1.php | 6 ++--- .../Api2/Product/Image/Rest/Admin/V1.php | 6 ++--- .../Api2/Product/Image/Rest/Customer/V1.php | 6 ++--- .../Api2/Product/Image/Rest/Guest/V1.php | 6 ++--- .../Model/Api2/Product/Rest/Admin/V1.php | 6 ++--- .../Model/Api2/Product/Rest/Customer/V1.php | 6 ++--- .../Model/Api2/Product/Rest/Guest/V1.php | 6 ++--- .../Catalog/Model/Api2/Product/Website.php | 6 ++--- .../Api2/Product/Website/Rest/Admin/V1.php | 6 ++--- .../Website/Validator/Admin/Website.php | 6 ++--- .../Mage/Catalog/Model/Category/Api/V2.php | 6 ++--- .../Model/Category/Attribute/Api/V2.php | 6 ++--- .../Category/Attribute/Backend/Sortby.php | 6 ++--- .../Category/Attribute/Backend/Urlkey.php | 7 +++--- .../Category/Attribute/Source/Sortby.php | 6 ++--- .../core/Mage/Catalog/Model/Category/Url.php | 6 ++--- .../Catalog/Model/Convert/Adapter/Product.php | 5 ----- .../core/Mage/Catalog/Model/Indexer/Url.php | 10 ++++++--- .../core/Mage/Catalog/Model/Layer/State.php | 12 +++++----- .../Mage/Catalog/Model/Product/Api/V2.php | 6 ++--- .../Model/Product/Attribute/Api/V2.php | 6 ++--- .../Model/Product/Attribute/Backend/Sku.php | 6 ++--- .../Product/Attribute/Backend/Startdate.php | 6 ++--- .../Backend/Startdate/Specialprice.php | 9 ++++---- .../Product/Attribute/Backend/Tierprice.php | 6 ++--- .../Product/Attribute/Backend/Urlkey.php | 7 +++--- .../Model/Product/Attribute/Media/Api/V2.php | 6 ++--- .../Model/Product/Attribute/Set/Api/V2.php | 6 ++--- .../Product/Attribute/Source/Msrp/Type.php | 6 ++--- .../Product/Attribute/Tierprice/Api/V2.php | 6 ++--- .../Catalog/Model/Product/Link/Api/V2.php | 6 ++--- .../Catalog/Model/Product/Option/Api/V2.php | 6 ++--- .../Model/Product/Option/Type/Default.php | 2 -- .../Model/Product/Option/Type/Text.php | 6 ++--- .../Catalog/Model/Product/Option/Value.php | 14 ++++++------ .../Model/Product/Option/Value/Api/V2.php | 6 ++--- .../Mage/Catalog/Model/Product/Status.php | 17 ++++++-------- .../core/Mage/Catalog/Model/Product/Type.php | 12 +++++----- .../Catalog/Model/Product/Type/Api/V2.php | 6 ++--- .../Catalog/Model/Product/Type/Simple.php | 12 +++++----- .../Catalog/Model/Product/Type/Virtual.php | 6 ++--- .../core/Mage/Catalog/Model/Product/Url.php | 6 ++--- .../Mage/Catalog/Model/Product/Visibility.php | 6 ++--- .../Mage/Catalog/Model/Product/Website.php | 14 ++++++------ .../Model/Resource/Category/Collection.php | 4 ---- .../Resource/Category/Flat/Collection.php | 4 ---- .../Resource/Category/Indexer/Product.php | 4 ---- .../Catalog/Model/Resource/Category/Tree.php | 12 +++++----- .../Mage/Catalog/Model/Resource/Config.php | 4 ---- .../Catalog/Model/Resource/Eav/Attribute.php | 4 ---- .../Resource/Eav/Mysql4/Category/Tree.php | 12 +++++----- .../Product/Attribute/Backend/Tierprice.php | 12 +++++----- .../Product/Attribute/Backend/Urlkey.php | 12 +++++----- .../Product/Attribute/Frontend/Tierprice.php | 12 +++++----- .../Eav/Mysql4/Product/Indexer/Eav/Source.php | 12 +++++----- .../Eav/Mysql4/Product/Option/Value.php | 12 +++++----- .../Resource/Eav/Mysql4/Product/Status.php | 12 +++++----- .../Resource/Eav/Mysql4/Product/Website.php | 12 +++++----- .../Model/Resource/Eav/Mysql4/Setup.php | 12 +++++----- .../Catalog/Model/Resource/Eav/Mysql4/Url.php | 12 +++++----- .../Model/Resource/Layer/Filter/Attribute.php | 4 ---- .../Model/Resource/Layer/Filter/Decimal.php | 4 ---- .../Model/Resource/Layer/Filter/Price.php | 4 ---- .../Product/Attribute/Backend/Groupprice.php | 4 ---- .../Product/Attribute/Backend/Tierprice.php | 16 +++++--------- .../Product/Attribute/Backend/Urlkey.php | 12 +++++----- .../Product/Attribute/Frontend/Tierprice.php | 12 +++++----- .../Model/Resource/Product/Compare/Item.php | 4 ---- .../Model/Resource/Product/Flat/Indexer.php | 4 ---- .../Resource/Product/Indexer/Eav/Decimal.php | 4 ---- .../Resource/Product/Indexer/Eav/Source.php | 16 +++++--------- .../Catalog/Model/Resource/Product/Link.php | 3 --- .../Catalog/Model/Resource/Product/Option.php | 4 ---- .../Model/Resource/Product/Option/Value.php | 16 +++++--------- .../Catalog/Model/Resource/Product/Status.php | 16 +++++--------- .../Configurable/Attribute/Collection.php | 4 ---- .../Model/Resource/Product/Website.php | 16 +++++--------- .../Mage/Catalog/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Catalog/Model/Resource/Url.php | 12 +++++----- app/code/core/Mage/Catalog/Model/Session.php | 8 +++---- .../Backend/Catalog/Url/Rewrite/Suffix.php | 10 ++++++--- app/code/core/Mage/Catalog/Model/Url.php | 6 ++--- .../controllers/Seo/SitemapController.php | 8 +++---- app/code/core/Mage/Catalog/etc/adminhtml.xml | 2 +- app/code/core/Mage/Catalog/etc/api.xml | 2 +- app/code/core/Mage/Catalog/etc/api2.xml | 2 +- app/code/core/Mage/Catalog/etc/config.xml | 2 +- app/code/core/Mage/Catalog/etc/convert.xml | 2 +- app/code/core/Mage/Catalog/etc/system.xml | 10 ++++----- app/code/core/Mage/Catalog/etc/widget.xml | 8 +++---- .../upgrade-1.6.0.0-1.6.0.0.1.php | 8 +++---- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 7 +++--- .../upgrade-1.6.0.0.10-1.6.0.0.11.php | 6 ++--- .../upgrade-1.6.0.0.11-1.6.0.0.12.php | 7 +++--- .../upgrade-1.6.0.0.14-1.6.0.0.15.php | 8 +++---- .../upgrade-1.6.0.0.15-1.6.0.0.18.php | 6 ++--- .../upgrade-1.6.0.0.18-1.6.0.0.19.php | 9 ++++---- .../upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php | 9 ++++---- .../upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php | 8 +++---- .../upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php | 6 ++--- .../upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php | 8 +++---- .../upgrade-1.6.0.0.2-1.6.0.0.3.php | 7 +++--- .../upgrade-1.6.0.0.3-1.6.0.0.4.php | 8 +++---- .../upgrade-1.6.0.0.4-1.6.0.0.5.php | 9 ++++---- .../upgrade-1.6.0.0.5-1.6.0.0.6.php | 8 +++---- .../upgrade-1.6.0.0.6-1.6.0.0.7.php | 6 ++--- .../upgrade-1.6.0.0.7-1.6.0.0.8.php | 6 ++--- .../upgrade-1.6.0.0.9-1.6.0.0.10.php | 6 ++--- .../Mage/CatalogIndex/Model/Data/Simple.php | 11 +++++----- .../Mage/CatalogIndex/Model/Data/Virtual.php | 10 +++++---- .../CatalogIndex/Model/Indexer/Tierprice.php | 14 ++++++------ .../Mage/CatalogIndex/Model/Mysql4/Setup.php | 12 +++++----- .../CatalogIndex/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/CatalogIndex/etc/config.xml | 2 +- .../Mage/CatalogInventory/Helper/Data.php | 6 ++--- .../Model/Api2/Stock/Item/Rest/Admin/V1.php | 6 ++--- .../CatalogInventory/Model/Indexer/Stock.php | 18 ++++++--------- .../Model/Mysql4/Indexer/Stock.php | 12 +++++----- .../CatalogInventory/Model/Mysql4/Stock.php | 12 +++++----- .../Model/Mysql4/Stock/Status.php | 12 +++++----- .../Model/Resource/Indexer/Stock.php | 16 +++++--------- .../Model/Resource/Indexer/Stock/Default.php | 4 ---- .../CatalogInventory/Model/Resource/Stock.php | 16 +++++--------- .../Model/Resource/Stock/Item.php | 4 ---- .../Model/Resource/Stock/Status.php | 16 +++++--------- .../CatalogInventory/Model/Source/Stock.php | 8 +++---- .../Mage/CatalogInventory/Model/Stock.php | 14 ++++++------ .../Model/Stock/Item/Api/V2.php | 8 ++++--- .../CatalogInventory/Model/Stock/Status.php | 14 ++++++------ .../Mage/CatalogInventory/etc/adminhtml.xml | 2 +- .../core/Mage/CatalogInventory/etc/api.xml | 2 +- .../core/Mage/CatalogInventory/etc/api2.xml | 2 +- .../core/Mage/CatalogInventory/etc/config.xml | 2 +- .../core/Mage/CatalogInventory/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 6 ++--- .../core/Mage/CatalogRule/Helper/Data.php | 6 ++--- .../core/Mage/CatalogRule/etc/adminhtml.xml | 2 +- app/code/core/Mage/CatalogRule/etc/config.xml | 2 +- .../upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../upgrade-1.6.0.2-1.6.0.3.php | 7 +++--- .../core/Mage/CatalogSearch/Block/Term.php | 6 ++--- .../core/Mage/CatalogSearch/Helper/Data.php | 6 ++--- .../core/Mage/CatalogSearch/Model/Query.php | 7 ------ .../CatalogSearch/Model/Resource/Advanced.php | 4 ---- .../Model/Resource/Indexer/Fulltext.php | 3 --- .../core/Mage/CatalogSearch/Model/Session.php | 11 +++++++--- .../Model/System/Config/Backend/Sitemap.php | 9 +++++--- .../controllers/TermController.php | 12 ++++++---- .../core/Mage/CatalogSearch/etc/adminhtml.xml | 2 +- .../core/Mage/CatalogSearch/etc/config.xml | 2 +- .../core/Mage/CatalogSearch/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0-1.8.2.0.php | 6 ++--- .../Centinel/Block/Adminhtml/Validation.php | 13 ++++++----- .../Centinel/Block/Authentication/Start.php | 11 ++++++---- app/code/core/Mage/Centinel/Helper/Data.php | 6 ++--- app/code/core/Mage/Centinel/Model/Session.php | 13 +++++------ .../core/Mage/Centinel/Model/State/Visa.php | 10 ++++++--- .../Mage/Centinel/Model/StateAbstract.php | 10 ++++++--- app/code/core/Mage/Centinel/etc/config.xml | 2 +- app/code/core/Mage/Centinel/etc/system.xml | 10 ++++----- .../Mage/Checkout/Block/Cart/Shipping.php | 10 +++++---- .../core/Mage/Checkout/Block/Cart/Sidebar.php | 12 +++++----- .../core/Mage/Checkout/Block/Cart/Totals.php | 11 +++++++--- .../Checkout/Block/Multishipping/Shipping.php | 6 ++--- .../Checkout/Block/Multishipping/State.php | 8 +++---- .../Checkout/Block/Multishipping/Success.php | 8 +++---- .../Mage/Checkout/Block/Onepage/Shipping.php | 10 +++++---- .../Mage/Checkout/Block/Onepage/Success.php | 6 ++--- app/code/core/Mage/Checkout/Block/Success.php | 10 ++++++--- .../core/Mage/Checkout/Block/Total/Tax.php | 10 +++++---- app/code/core/Mage/Checkout/Helper/Data.php | 6 ++--- app/code/core/Mage/Checkout/Helper/Url.php | 10 +++++---- .../core/Mage/Checkout/Model/Cart/Api/V2.php | 12 +++++----- .../Checkout/Model/Cart/Coupon/Api/V2.php | 13 +++++------ .../Checkout/Model/Cart/Customer/Api/V2.php | 12 +++++----- .../Checkout/Model/Cart/Payment/Api/V2.php | 13 +++++------ .../Checkout/Model/Cart/Product/Api/V2.php | 13 +++++------ .../Checkout/Model/Cart/Shipping/Api/V2.php | 13 +++++------ .../Model/Config/Source/Cart/Summary.php | 12 +++++++--- .../core/Mage/Checkout/Model/Mysql4/Setup.php | 12 +++++----- .../Checkout/Model/Resource/Agreement.php | 4 ---- .../Mage/Checkout/Model/Resource/Cart.php | 4 ---- .../Mage/Checkout/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Checkout/Model/Session.php | 10 +++++---- .../Checkout/Model/Type/Multishipping.php | 3 --- .../Model/Type/Multishipping/State.php | 8 +++---- app/code/core/Mage/Checkout/etc/adminhtml.xml | 2 +- app/code/core/Mage/Checkout/etc/api.xml | 2 +- app/code/core/Mage/Checkout/etc/config.xml | 2 +- .../core/Mage/Checkout/etc/jstranslator.xml | 2 +- app/code/core/Mage/Checkout/etc/system.xml | 10 ++++----- .../Mage/Cms/Model/Wysiwyg/Images/Storage.php | 12 +++++----- app/code/core/Mage/Cms/etc/adminhtml.xml | 2 +- app/code/core/Mage/Cms/etc/config.xml | 2 +- app/code/core/Mage/Cms/etc/system.xml | 10 ++++----- app/code/core/Mage/Cms/etc/widget.xml | 8 +++---- .../Block/Catalog/Layer/State/Swatch.php | 10 ++++++--- .../View/Type/Configurable/Swatches.php | 10 ++++++--- .../Mage/ConfigurableSwatches/Helper/Data.php | 6 ++--- .../Helper/Swatchdimensions.php | 10 ++++++--- .../ConfigurableSwatches/etc/adminhtml.xml | 2 +- .../Mage/ConfigurableSwatches/etc/config.xml | 2 +- .../ConfigurableSwatches/etc/jstranslator.xml | 2 +- .../Mage/ConfigurableSwatches/etc/system.xml | 10 ++++----- app/code/core/Mage/Contacts/etc/adminhtml.xml | 2 +- app/code/core/Mage/Contacts/etc/config.xml | 2 +- app/code/core/Mage/Contacts/etc/system.xml | 10 ++++----- .../core/Mage/Core/Block/Store/Switcher.php | 8 +++---- app/code/core/Mage/Core/Block/Template.php | 6 ++--- .../core/Mage/Core/Block/Template/Smarty.php | 12 ++++++---- .../core/Mage/Core/Block/Template/Zend.php | 8 +++---- app/code/core/Mage/Core/Block/Text.php | 10 +++++---- app/code/core/Mage/Core/Block/Text/Tag.php | 11 +++++----- .../Mage/Core/Controller/Varien/Action.php | 2 -- .../Controller/Varien/Router/Standard.php | 11 +++++++--- app/code/core/Mage/Core/Helper/Data.php | 6 ++--- .../core/Mage/Core/Helper/File/Storage.php | 12 +++++----- app/code/core/Mage/Core/Helper/String.php | 10 +++++---- app/code/core/Mage/Core/Helper/Translate.php | 10 +++++---- .../Mage/Core/Helper/UnserializeArray.php | 12 +++++----- app/code/core/Mage/Core/Helper/Url.php | 13 +++++------ app/code/core/Mage/Core/Model/App.php | 3 --- .../core/Mage/Core/Model/App/Emulation.php | 2 -- .../core/Mage/Core/Model/Config/System.php | 8 +++---- .../core/Mage/Core/Model/Design/Fallback.php | 1 - .../core/Mage/Core/Model/Email/Template.php | 14 ++++++------ .../core/Mage/Core/Model/Email/Transport.php | 11 +++++++--- .../core/Mage/Core/Model/File/Storage.php | 12 +++++----- .../core/Mage/Core/Model/File/Uploader.php | 6 ++--- .../Model/File/Validator/AvailablePath.php | 3 --- .../File/Validator/NotProtectedExtension.php | 3 --- .../Model/File/Validator/StreamWrapper.php | 6 ++--- .../core/Mage/Core/Model/Layout/Update.php | 11 +++++++--- .../core/Mage/Core/Model/Layout/Validator.php | 9 +++----- .../core/Mage/Core/Model/Magento/Api/V2.php | 6 ++--- .../core/Mage/Core/Model/Message/Success.php | 11 +++++++--- .../core/Mage/Core/Model/Message/Warning.php | 11 +++++++--- .../Mage/Core/Model/Mysql4/Email/Template.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Session.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Store.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Translate.php | 12 +++++----- .../Core/Model/Mysql4/Translate/String.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Variable.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Website.php | 12 +++++----- .../core/Mage/Core/Model/Resource/Cache.php | 4 ---- .../core/Mage/Core/Model/Resource/Config.php | 4 ---- .../Mage/Core/Model/Resource/Config/Data.php | 4 ---- .../core/Mage/Core/Model/Resource/Design.php | 4 ---- .../Core/Model/Resource/Email/Template.php | 16 +++++--------- .../Mage/Core/Model/Resource/Entity/Table.php | 11 +++++----- .../core/Mage/Core/Model/Resource/Flag.php | 4 ---- .../Mage/Core/Model/Resource/Language.php | 4 ---- .../core/Mage/Core/Model/Resource/Layout.php | 4 ---- .../Mage/Core/Model/Resource/Resource.php | 4 ---- .../core/Mage/Core/Model/Resource/Session.php | 16 +++++--------- .../core/Mage/Core/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Core/Model/Resource/Store.php | 16 +++++--------- .../Mage/Core/Model/Resource/Store/Group.php | 4 ---- .../Mage/Core/Model/Resource/Transaction.php | 8 +++---- .../Mage/Core/Model/Resource/Translate.php | 16 +++++--------- .../Core/Model/Resource/Translate/String.php | 16 +++++--------- .../Model/Resource/Type/Db/Mysqli/Setup.php | 11 +++++++--- .../Mage/Core/Model/Resource/Url/Rewrite.php | 4 ---- .../Mage/Core/Model/Resource/Variable.php | 16 +++++--------- .../core/Mage/Core/Model/Resource/Website.php | 16 +++++--------- app/code/core/Mage/Core/Model/Session.php | 10 +++++---- .../Core/Model/Session/Abstract/Varien.php | 13 +++++++---- .../Mage/Core/Model/Session/Abstract/Zend.php | 8 +++---- .../Core/Model/Source/Email/Variables.php | 10 +++------ app/code/core/Mage/Core/Model/Store.php | 16 ++++++-------- .../core/Mage/Core/Model/Store/Api/V2.php | 6 ++--- app/code/core/Mage/Core/Model/Template.php | 12 +++++----- app/code/core/Mage/Core/Model/Translate.php | 10 +++++---- .../core/Mage/Core/Model/Translate/String.php | 14 ++++++------ app/code/core/Mage/Core/Model/Url.php | 8 +++---- .../core/Mage/Core/Model/Url/Validator.php | 6 ++--- app/code/core/Mage/Core/Model/Variable.php | 14 ++++++------ app/code/core/Mage/Core/Model/Website.php | 15 ++++++------- app/code/core/Mage/Core/etc/api.xml | 2 +- app/code/core/Mage/Core/etc/config.xml | 2 +- app/code/core/Mage/Core/etc/jstranslator.xml | 2 +- app/code/core/Mage/Core/etc/system.xml | 10 ++++----- .../core_setup/upgrade-1.6.0.1-1.6.0.2.php | 7 +++--- .../core_setup/upgrade-1.6.0.2-1.6.0.3.php | 8 +++---- .../core_setup/upgrade-1.6.0.3-1.6.0.4.php | 8 +++---- .../core_setup/upgrade-1.6.0.5-1.6.0.6.php | 7 +++--- .../core_setup/upgrade-1.6.0.6-1.6.0.7.php | 9 ++++---- .../core_setup/upgrade-1.6.0.7-1.6.0.8.php | 9 ++++---- .../core_setup/upgrade-1.6.0.8-1.6.0.9.php | 9 ++++---- .../core_setup/upgrade-1.6.0.9-1.6.0.10.php | 7 +++--- app/code/core/Mage/Cron/etc/config.xml | 2 +- app/code/core/Mage/Cron/etc/system.xml | 10 ++++----- .../Block/Adminhtml/System/Currencysymbol.php | 3 --- .../System/CurrencysymbolController.php | 6 ++--- .../Mage/CurrencySymbol/etc/adminhtml.xml | 2 +- .../core/Mage/CurrencySymbol/etc/config.xml | 2 +- .../Mage/Customer/Block/Account/Dashboard.php | 6 ++--- .../Block/Account/Dashboard/Sidebar.php | 9 ++++---- .../Mage/Customer/Block/Widget/Taxvat.php | 10 ++++++--- .../Mage/Customer/Model/Address/Api/V2.php | 6 ++--- .../Api2/Customer/Address/Rest/Admin/V1.php | 6 ++--- .../Customer/Address/Rest/Customer/V1.php | 6 ++--- .../Model/Api2/Customer/Address/Validator.php | 6 ++--- .../Model/Api2/Customer/Rest/Admin/V1.php | 6 ++--- .../Model/Api2/Customer/Rest/Customer/V1.php | 6 ++--- .../Customer/Model/Attribute/Data/Text.php | 12 +++++----- .../Model/Attribute/Data/Textarea.php | 12 +++++----- .../core/Mage/Customer/Model/Config/Share.php | 8 +++---- .../Model/Convert/Adapter/Customer.php | 6 ++--- .../Model/Convert/Parser/Customer.php | 6 ++--- .../core/Mage/Customer/Model/Customer.php | 6 ++--- .../Mage/Customer/Model/Customer/Api/V2.php | 6 ++--- .../Customer/Attribute/Backend/Shipping.php | 8 +++---- .../Customer/Attribute/Backend/Store.php | 8 +++---- .../Customer/Attribute/Backend/Website.php | 8 +++---- .../Model/Customer/Attribute/Source/Store.php | 8 +++---- .../Customer/Attribute/Source/Website.php | 8 +++---- .../Address/Attribute/Backend/Street.php | 12 +++++----- .../Address/Attribute/Source/Country.php | 2 -- .../core/Mage/Customer/Model/Entity/Setup.php | 12 +++++----- .../core/Mage/Customer/Model/Group/Api/V2.php | 6 ++--- .../Address/Attribute/Backend/Street.php | 12 +++++----- .../Model/Resource/Form/Attribute.php | 4 ---- .../Mage/Customer/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Customer/Model/Session.php | 14 ++++++------ app/code/core/Mage/Customer/etc/adminhtml.xml | 2 +- app/code/core/Mage/Customer/etc/api.xml | 2 +- app/code/core/Mage/Customer/etc/api2.xml | 2 +- app/code/core/Mage/Customer/etc/config.xml | 2 +- app/code/core/Mage/Customer/etc/system.xml | 10 ++++----- .../upgrade-1.6.1.0-1.6.2.0.php | 6 ++--- .../upgrade-1.6.2.0-1.6.2.0.1.php | 6 ++--- .../upgrade-1.6.2.0.1-1.6.2.0.2.php | 6 ++--- .../upgrade-1.6.2.0.3-1.6.2.0.4.php | 6 ++--- .../upgrade-1.6.2.0.4-1.6.2.0.5.php | 6 ++--- .../upgrade-1.6.2.0.5-1.6.2.0.6.php | 6 ++--- .../upgrade-1.6.2.0.6-1.6.2.0.7.php | 6 ++--- .../Model/Convert/Adapter/Db/Table.php | 10 ++++----- .../Dataflow/Model/Convert/Adapter/Soap.php | 10 ++++----- .../Dataflow/Model/Convert/Adapter/Std.php | 10 ++++----- .../Mage/Dataflow/Model/Mysql4/Session.php | 12 +++++----- .../Mage/Dataflow/Model/Resource/Batch.php | 4 ---- .../Dataflow/Model/Resource/Batch/Export.php | 4 ---- .../Dataflow/Model/Resource/Batch/Import.php | 4 ---- .../Mage/Dataflow/Model/Resource/Import.php | 4 ---- .../Mage/Dataflow/Model/Resource/Profile.php | 4 ---- .../Model/Resource/Profile/History.php | 3 --- .../Mage/Dataflow/Model/Resource/Session.php | 16 +++++--------- app/code/core/Mage/Dataflow/Model/Session.php | 16 ++++++-------- app/code/core/Mage/Dataflow/etc/config.xml | 2 +- .../Adminhtml/Frontend/Region/Updater.php | 11 +++++++--- app/code/core/Mage/Directory/Helper/Data.php | 1 - app/code/core/Mage/Directory/Helper/Url.php | 10 +++++---- .../Mage/Directory/Model/Country/Api/V2.php | 6 ++--- .../Model/Currency/Import/Webservicex.php | 9 ++++---- .../Mage/Directory/Model/Region/Api/V2.php | 6 ++--- .../Model/Resource/Country/Collection.php | 3 --- .../Resource/Country/Format/Collection.php | 4 ---- app/code/core/Mage/Directory/etc/api.xml | 2 +- app/code/core/Mage/Directory/etc/config.xml | 2 +- app/code/core/Mage/Directory/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../Block/Catalog/Product/View/Type.php | 13 +++++------ .../Downloadable/Block/Checkout/Success.php | 7 +++--- .../Downloadable/Model/Link/Api/Uploader.php | 12 +++++----- .../Mage/Downloadable/Model/Link/Api/V2.php | 12 +++++----- .../Downloadable/Model/Link/Api/Validator.php | 12 +++++----- .../Mage/Downloadable/Model/Product/Type.php | 12 +++++----- .../Mage/Downloadable/Model/Resource/Link.php | 3 --- .../Downloadable/Model/Resource/Sample.php | 4 ---- .../core/Mage/Downloadable/etc/adminhtml.xml | 2 +- app/code/core/Mage/Downloadable/etc/api.xml | 2 +- .../core/Mage/Downloadable/etc/config.xml | 2 +- .../core/Mage/Downloadable/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0-1.6.0.0.1.php | 6 ++--- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 6 ++--- .../upgrade-1.6.0.0.2-1.6.0.0.3.php | 8 ++++--- .../Config/Source/Inputtype/Validator.php | 6 +---- .../Mage/Eav/Model/Attribute/Data/Text.php | 2 +- .../Eav/Model/Attribute/Data/Textarea.php | 2 +- .../Model/Entity/Attribute/Backend/Store.php | 2 +- .../Entity/Attribute/Backend/Time/Updated.php | 2 +- .../Mage/Eav/Model/Entity/Attribute/Set.php | 6 +---- .../Model/Entity/Attribute/Source/Store.php | 2 +- .../Model/Entity/Attribute/Source/Table.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Setup.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Store.php | 5 +---- app/code/core/Mage/Eav/Model/Entity/Type.php | 5 +---- app/code/core/Mage/Eav/Model/Form/Type.php | 2 +- .../Eav/Model/Mysql4/Entity/Attribute/Set.php | 2 +- .../Mage/Eav/Model/Mysql4/Entity/Store.php | 2 +- .../Mage/Eav/Model/Mysql4/Entity/Type.php | 2 +- .../core/Mage/Eav/Model/Mysql4/Form/Type.php | 2 +- .../Eav/Model/Resource/Entity/Attribute.php | 6 ----- .../Model/Resource/Entity/Attribute/Set.php | 6 +---- .../Mage/Eav/Model/Resource/Entity/Store.php | 5 +---- .../Mage/Eav/Model/Resource/Entity/Type.php | 5 +---- .../Mage/Eav/Model/Resource/Form/Element.php | 3 --- .../Mage/Eav/Model/Resource/Form/Fieldset.php | 3 --- .../Mage/Eav/Model/Resource/Form/Type.php | 6 +---- app/code/core/Mage/Eav/etc/config.xml | 2 +- .../sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php | 4 ++-- app/code/core/Mage/GiftMessage/Helper/Url.php | 8 +++---- .../core/Mage/GiftMessage/Model/Api/V2.php | 6 ++--- .../Mage/GiftMessage/Model/Mysql4/Setup.php | 12 +++++----- .../Mage/GiftMessage/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/GiftMessage/etc/api.xml | 2 +- app/code/core/Mage/GiftMessage/etc/config.xml | 2 +- app/code/core/Mage/GiftMessage/etc/system.xml | 10 ++++----- .../Model/System/Config/Source/Type.php | 7 +++--- .../Mage/GoogleAnalytics/etc/adminhtml.xml | 2 +- .../core/Mage/GoogleAnalytics/etc/config.xml | 2 +- .../core/Mage/GoogleAnalytics/etc/system.xml | 10 ++++----- .../core/Mage/GoogleCheckout/etc/config.xml | 2 +- .../Block/Adminhtml/Import/Edit.php | 3 --- .../Model/Export/Entity/Abstract.php | 3 --- .../Model/Export/Entity/Customer.php | 3 --- .../Model/Export/Entity/Product.php | 3 --- .../Export/Entity/Product/Type/Simple.php | 12 +++++----- .../Model/Import/Entity/Abstract.php | 3 --- .../Model/Import/Entity/Customer.php | 3 --- .../Model/Import/Entity/Customer/Address.php | 2 -- .../Model/Import/Entity/Product.php | 4 ---- .../Import/Entity/Product/Type/Simple.php | 12 +++++----- .../ImportExport/Model/Import/Uploader.php | 12 +++++----- .../Mage/ImportExport/Model/Mysql4/Setup.php | 12 +++++----- .../Product/Attribute/Backend/Urlkey.php | 12 +++++----- .../ImportExport/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/ImportExport/etc/adminhtml.xml | 2 +- .../core/Mage/ImportExport/etc/config.xml | 2 +- .../core/Mage/ImportExport/etc/system.xml | 10 ++++----- .../Block/Adminhtml/Process/Edit/Tabs.php | 12 ++++++---- app/code/core/Mage/Index/Model/Lock.php | 3 --- .../core/Mage/Index/Model/Lock/Storage/Db.php | 3 --- .../core/Mage/Index/Model/Mysql4/Setup.php | 12 +++++----- .../Index/Model/Resource/Lock/Resource.php | 3 --- .../Model/Resource/Process/Collection.php | 4 ---- .../core/Mage/Index/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Index/etc/adminhtml.xml | 2 +- app/code/core/Mage/Index/etc/config.xml | 2 +- app/code/core/Mage/Install/Block/Db/Type.php | 10 +++++---- app/code/core/Mage/Install/Block/State.php | 9 ++++---- app/code/core/Mage/Install/Model/Session.php | 8 +++---- app/code/core/Mage/Install/Model/Wizard.php | 8 +++---- .../Install/controllers/WizardController.php | 10 ++++++--- app/code/core/Mage/Install/etc/config.xml | 2 +- app/code/core/Mage/Install/etc/install.xml | 2 +- .../core/Mage/Log/Model/Mysql4/Visitor.php | 2 +- .../core/Mage/Log/Model/Resource/Visitor.php | 6 +---- .../Log/Model/Resource/Visitor/Online.php | 4 ---- app/code/core/Mage/Log/Model/Visitor.php | 2 +- app/code/core/Mage/Log/etc/config.xml | 2 +- app/code/core/Mage/Log/etc/system.xml | 10 ++++----- app/code/core/Mage/Media/etc/config.xml | 2 +- .../core/Mage/Newsletter/Block/Subscribe.php | 9 ++++---- .../Newsletter/Model/Mysql4/Subscriber.php | 12 +++++----- .../Mage/Newsletter/Model/Mysql4/Template.php | 12 +++++----- .../Mage/Newsletter/Model/Resource/Queue.php | 4 ---- .../Newsletter/Model/Resource/Subscriber.php | 13 +++++------ .../Model/Resource/Subscriber/Collection.php | 5 ----- .../Newsletter/Model/Resource/Template.php | 16 +++++--------- .../core/Mage/Newsletter/Model/Session.php | 9 ++++---- .../core/Mage/Newsletter/Model/Subscriber.php | 17 ++++++-------- .../core/Mage/Newsletter/Model/Template.php | 14 ++++++------ .../controllers/SubscriberController.php | 12 +++++----- .../core/Mage/Newsletter/etc/adminhtml.xml | 2 +- app/code/core/Mage/Newsletter/etc/config.xml | 2 +- app/code/core/Mage/Newsletter/etc/system.xml | 10 ++++----- .../Block/Adminhtml/Oauth/Admin/Token.php | 6 ++--- .../Mage/Oauth/Block/Authorize/Abstract.php | 3 --- .../core/Mage/Oauth/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Oauth/Model/Resource/Token.php | 12 +++++----- app/code/core/Mage/Oauth/Model/Token.php | 13 ++++++----- .../Adminhtml/Oauth/Admin/TokenController.php | 12 +++++----- .../controllers/Customer/TokenController.php | 12 +++++----- .../Oauth/controllers/TokenController.php | 12 +++++----- app/code/core/Mage/Oauth/etc/adminhtml.xml | 2 +- app/code/core/Mage/Oauth/etc/config.xml | 2 +- app/code/core/Mage/Oauth/etc/system.xml | 10 ++++----- .../core/Mage/Page/Block/Html/Toplinks.php | 10 ++++++--- .../core/Mage/Page/Block/Html/Topmenu.php | 12 +++++----- .../core/Mage/Page/Block/Html/Welcome.php | 6 ++--- .../core/Mage/Page/Block/Html/Wrapper.php | 10 ++++++--- .../core/Mage/Page/Block/Js/Translate.php | 10 +++++---- app/code/core/Mage/Page/Block/Switch.php | 8 +++---- app/code/core/Mage/Page/etc/config.xml | 2 +- app/code/core/Mage/Page/etc/system.xml | 10 ++++----- .../Mage/PageCache/Model/Control/Zend.php | 12 +++++----- .../core/Mage/PageCache/etc/adminhtml.xml | 2 +- app/code/core/Mage/PageCache/etc/config.xml | 2 +- app/code/core/Mage/PageCache/etc/system.xml | 10 ++++----- app/code/core/Mage/Paygate/Helper/Data.php | 6 ++--- app/code/core/Mage/Paygate/etc/config.xml | 2 +- app/code/core/Mage/Paygate/etc/system.xml | 10 ++++----- app/code/core/Mage/Payment/Helper/Data.php | 6 ++--- app/code/core/Mage/Payment/etc/adminhtml.xml | 2 +- app/code/core/Mage/Payment/etc/config.xml | 2 +- app/code/core/Mage/Payment/etc/system.xml | 10 ++++----- .../payment_setup/upgrade-1.6.0.0-1.6.0.1.php | 8 +++---- .../System/Config/Field/SolutionType.php | 6 ++--- .../System/Config/Fieldset/Store.php | 11 ++++++---- .../Paypal/Block/Express/Review/Shipping.php | 6 ++--- .../Mage/Paypal/Block/Express/Shortcut.php | 10 ++++++--- app/code/core/Mage/Paypal/Helper/Data.php | 6 ++--- .../core/Mage/Paypal/Model/Api/Standard.php | 10 ++++++--- .../Paypal/Model/Mysql4/Report/Settlement.php | 12 +++++----- .../core/Mage/Paypal/Model/Mysql4/Setup.php | 12 +++++----- .../Mage/Paypal/Model/Payment/Transaction.php | 18 ++++++--------- .../Mage/Paypal/Model/Report/Settlement.php | 20 +++++++---------- .../core/Mage/Paypal/Model/Resource/Cert.php | 3 --- .../Model/Resource/Payment/Transaction.php | 12 +++++----- .../Model/Resource/Report/Settlement.php | 12 +++++----- .../core/Mage/Paypal/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Paypal/Model/Session.php | 10 +++++---- app/code/core/Mage/Paypal/Model/Standard.php | 10 +++++---- .../Model/System/Config/Source/UrlMethod.php | 12 +++++----- .../System/Config/Source/YesnoShortcut.php | 12 +++++----- .../core/Mage/Paypal/UnavailableException.php | 12 ++++++---- .../Paypal/controllers/StandardController.php | 8 +++---- app/code/core/Mage/Paypal/etc/adminhtml.xml | 2 +- app/code/core/Mage/Paypal/etc/config.xml | 2 +- app/code/core/Mage/Paypal/etc/system.xml | 10 ++++----- .../paypal_setup/upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../paypal_setup/upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../paypal_setup/upgrade-1.6.0.3-1.6.0.4.php | 6 ++--- .../Mage/PaypalUk/Block/Express/Shortcut.php | 10 ++++++--- app/code/core/Mage/PaypalUk/Helper/Data.php | 6 ++--- app/code/core/Mage/PaypalUk/Model/Session.php | 10 +++++---- app/code/core/Mage/PaypalUk/etc/config.xml | 2 +- .../core/Mage/Persistent/Helper/Session.php | 6 ++--- .../Persistent/Model/Observer/Session.php | 6 ++--- .../Persistent/Model/Resource/Session.php | 15 +++++-------- .../core/Mage/Persistent/Model/Session.php | 6 ++--- .../core/Mage/Persistent/etc/adminhtml.xml | 2 +- app/code/core/Mage/Persistent/etc/config.xml | 2 +- .../core/Mage/Persistent/etc/persistent.xml | 2 +- app/code/core/Mage/Persistent/etc/system.xml | 10 ++++----- app/code/core/Mage/Poll/Helper/Data.php | 6 ++--- .../core/Mage/Poll/Model/Mysql4/Poll/Vote.php | 12 +++++----- app/code/core/Mage/Poll/Model/Poll/Vote.php | 14 ++++++------ .../Mage/Poll/Model/Resource/Poll/Vote.php | 12 +++++----- .../Mage/Poll/controllers/VoteController.php | 12 +++++----- app/code/core/Mage/Poll/etc/adminhtml.xml | 2 +- app/code/core/Mage/Poll/etc/config.xml | 2 +- app/code/core/Mage/Poll/etc/system.xml | 10 ++++----- .../Mage/ProductAlert/Block/Email/Stock.php | 12 ++++------ .../Mage/ProductAlert/Block/Product/View.php | 11 +++++++--- .../core/Mage/ProductAlert/Block/Stock.php | 9 +++++--- .../Mage/ProductAlert/Model/Mysql4/Stock.php | 12 +++++----- .../ProductAlert/Model/Resource/Price.php | 4 ---- .../ProductAlert/Model/Resource/Stock.php | 16 +++++--------- .../core/Mage/ProductAlert/Model/Stock.php | 14 ++++++------ .../controllers/UnsubscribeController.php | 8 +++---- .../core/Mage/ProductAlert/etc/config.xml | 2 +- .../core/Mage/ProductAlert/etc/system.xml | 10 ++++----- app/code/core/Mage/Rating/Helper/Data.php | 6 ++--- .../Model/Mysql4/Rating/Option/Vote.php | 12 +++++----- .../Mage/Rating/Model/Rating/Option/Vote.php | 9 ++++---- .../Model/Resource/Rating/Option/Vote.php | 16 +++++--------- app/code/core/Mage/Rating/etc/adminhtml.xml | 2 +- app/code/core/Mage/Rating/etc/config.xml | 2 +- .../Mage/Reports/Block/Product/Viewed.php | 6 ++--- .../Reports/Block/Product/Widget/Viewed.php | 10 +++------ app/code/core/Mage/Reports/Helper/Data.php | 6 ++--- app/code/core/Mage/Reports/Model/Event.php | 6 ++--- .../core/Mage/Reports/Model/Event/Type.php | 15 ++++++------- .../Mage/Reports/Model/Mysql4/Event/Type.php | 12 +++++----- .../Model/Mysql4/Product/Index/Viewed.php | 12 +++++----- .../Reports/Model/Product/Index/Viewed.php | 14 ++++++------ .../Reports/Model/Resource/Event/Type.php | 16 +++++--------- .../Model/Resource/Product/Index/Compared.php | 4 ---- .../Model/Resource/Product/Index/Viewed.php | 16 +++++--------- .../Model/Resource/Report/Product/Viewed.php | 16 +++++--------- app/code/core/Mage/Reports/Model/Session.php | 6 ++--- app/code/core/Mage/Reports/Model/Test.php | 10 ++++----- app/code/core/Mage/Reports/Model/Totals.php | 8 +++---- app/code/core/Mage/Reports/etc/adminhtml.xml | 2 +- app/code/core/Mage/Reports/etc/config.xml | 2 +- app/code/core/Mage/Reports/etc/system.xml | 10 ++++----- app/code/core/Mage/Reports/etc/widget.xml | 8 +++---- .../upgrade-1.6.0.0-1.6.0.0.1.php | 9 +++----- .../core/Mage/Review/Block/Customer/View.php | 8 +++---- .../core/Mage/Review/Block/Product/View.php | 6 ++--- app/code/core/Mage/Review/Block/View.php | 8 +++---- app/code/core/Mage/Review/Helper/Data.php | 6 ++--- .../Review/Model/Mysql4/Review/Summary.php | 12 +++++----- .../Mage/Review/Model/Resource/Review.php | 1 - .../Review/Model/Resource/Review/Status.php | 17 +++++--------- .../Review/Model/Resource/Review/Summary.php | 12 +++++----- .../core/Mage/Review/Model/Review/Status.php | 10 ++++----- .../core/Mage/Review/Model/Review/Summary.php | 9 ++++---- app/code/core/Mage/Review/Model/Session.php | 8 +++---- app/code/core/Mage/Review/etc/adminhtml.xml | 2 +- app/code/core/Mage/Review/etc/config.xml | 2 +- app/code/core/Mage/Review/etc/system.xml | 10 ++++----- .../core/Mage/Rss/Block/Catalog/Special.php | 8 +++---- app/code/core/Mage/Rss/Block/Catalog/Tag.php | 8 +++---- app/code/core/Mage/Rss/Block/Order/Status.php | 8 +++---- app/code/core/Mage/Rss/Block/Wishlist.php | 6 ++--- app/code/core/Mage/Rss/Model/Session.php | 8 +++---- app/code/core/Mage/Rss/etc/adminhtml.xml | 2 +- app/code/core/Mage/Rss/etc/config.xml | 2 +- app/code/core/Mage/Rss/etc/system.xml | 10 ++++----- app/code/core/Mage/Rule/Helper/Data.php | 6 ++--- .../Resource/Rule/Condition/SqlBuilder.php | 14 +++++++----- app/code/core/Mage/Rule/etc/config.xml | 2 +- .../Adminhtml/Billing/Agreement/View.php | 10 +++++---- .../Adminhtml/Billing/Agreement/View/Tabs.php | 14 +++++------- .../Adminhtml/Recurring/Profile/View.php | 10 ++++++--- .../Sales/Block/Billing/Agreement/View.php | 10 +++++---- .../Sales/Block/Order/Creditmemo/Totals.php | 12 +++++++--- .../Mage/Sales/Block/Order/Invoice/Totals.php | 12 +++++++--- .../Mage/Sales/Block/Order/Print/Shipment.php | 9 ++++---- .../core/Mage/Sales/Block/Order/Shipment.php | 8 +++---- app/code/core/Mage/Sales/Block/Order/Tax.php | 8 +++---- .../core/Mage/Sales/Block/Order/Totals.php | 12 +++++++--- app/code/core/Mage/Sales/Block/Order/View.php | 8 +++---- .../Sales/Block/Recurring/Profile/View.php | 10 ++++++--- .../core/Mage/Sales/Block/Reorder/Sidebar.php | 14 ++++++------ .../Api2/Order/Address/Rest/Admin/V1.php | 6 ++--- .../Api2/Order/Address/Rest/Customer/V1.php | 6 ++--- .../Api2/Order/Comment/Rest/Admin/V1.php | 6 ++--- .../Api2/Order/Comment/Rest/Customer/V1.php | 6 ++--- .../Model/Api2/Order/Item/Rest/Admin/V1.php | 6 ++--- .../Api2/Order/Item/Rest/Customer/V1.php | 6 ++--- .../Sales/Model/Api2/Order/Rest/Admin/V1.php | 6 ++--- .../Model/Api2/Order/Rest/Customer/V1.php | 6 ++--- .../core/Mage/Sales/Model/Email/Template.php | 11 +++++++--- .../Order/Attribute/Backend/Shipping.php | 9 ++++---- .../Sales/Model/Entity/Order/Shipment.php | 9 ++++---- .../Model/Entity/Order/Shipment/Track.php | 8 +++---- .../Attribute/Frontend/Custbalance.php | 6 ++--- .../Address/Attribute/Frontend/Shipping.php | 11 +++++++--- .../Address/Attribute/Frontend/Subtotal.php | 11 +++++++--- .../Quote/Address/Attribute/Frontend/Tax.php | 11 +++++++--- .../core/Mage/Sales/Model/Entity/Setup.php | 11 +++++++--- .../Order/Attribute/Backend/Shipping.php | 12 +++++----- .../Mysql4/Order/Payment/Transaction.php | 12 +++++----- .../Sales/Model/Mysql4/Order/Shipment.php | 12 +++++----- .../Model/Mysql4/Order/Shipment/Track.php | 12 +++++----- .../Mage/Sales/Model/Mysql4/Order/Status.php | 10 ++++++--- .../Mage/Sales/Model/Mysql4/Order/Tax.php | 12 +++++----- .../Address/Attribute/Frontend/Shipping.php | 12 +++++----- .../Address/Attribute/Frontend/Subtotal.php | 12 +++++----- .../Quote/Address/Attribute/Frontend/Tax.php | 12 +++++----- .../Sales/Model/Mysql4/Report/Shipping.php | 12 +++++----- .../Report/Shipping/Collection/Shipment.php | 12 +++++----- .../core/Mage/Sales/Model/Mysql4/Setup.php | 12 +++++----- .../core/Mage/Sales/Model/Order/Api/V2.php | 6 ++--- .../core/Mage/Sales/Model/Order/Config.php | 3 --- .../Sales/Model/Order/Creditmemo/Api/V2.php | 7 +++--- .../Sales/Model/Order/Creditmemo/Config.php | 3 --- .../Model/Order/Creditmemo/Total/Shipping.php | 12 +++++----- .../Model/Order/Creditmemo/Total/Subtotal.php | 11 +++++++--- .../Model/Order/Creditmemo/Total/Tax.php | 10 ++++++--- .../Mage/Sales/Model/Order/Invoice/Api/V2.php | 6 ++--- .../Mage/Sales/Model/Order/Invoice/Config.php | 3 --- .../Model/Order/Invoice/Total/Shipping.php | 8 +++---- .../Model/Order/Invoice/Total/Subtotal.php | 11 +++++++--- .../Sales/Model/Order/Invoice/Total/Tax.php | 10 ++++++--- .../core/Mage/Sales/Model/Order/Payment.php | 4 ---- .../Sales/Model/Order/Payment/Transaction.php | 21 +++++------------- .../Mage/Sales/Model/Order/Pdf/Shipment.php | 6 ++--- .../core/Mage/Sales/Model/Order/Shipment.php | 14 ++++++------ .../Sales/Model/Order/Shipment/Api/V2.php | 6 ++--- .../Mage/Sales/Model/Order/Shipment/Track.php | 14 ++++++------ .../core/Mage/Sales/Model/Order/Status.php | 11 +++++++--- app/code/core/Mage/Sales/Model/Order/Tax.php | 13 +++++------ .../core/Mage/Sales/Model/Order/Total.php | 11 +++++++--- .../Mage/Sales/Model/Quote/Address/Total.php | 10 ++++++--- .../Model/Quote/Address/Total/Custbalance.php | 6 ++--- .../Address/Total/Nominal/Recurring/Trial.php | 10 ++++++--- .../Quote/Address/Total/Nominal/Shipping.php | 10 ++++++--- .../Quote/Address/Total/Nominal/Subtotal.php | 10 ++++++--- .../Model/Quote/Address/Total/Shipping.php | 11 +++++++--- .../Model/Quote/Address/Total/Subtotal.php | 10 ++++++--- .../Sales/Model/Quote/Address/Total/Tax.php | 11 +++++++--- .../core/Mage/Sales/Model/Resource/Order.php | 10 --------- .../Sales/Model/Resource/Order/Abstract.php | 4 ---- .../Sales/Model/Resource/Order/Address.php | 2 -- .../Resource/Order/Address/Collection.php | 8 ------- .../Order/Attribute/Backend/Shipping.php | 12 +++++----- .../Sales/Model/Resource/Order/Collection.php | 8 ------- .../Sales/Model/Resource/Order/Creditmemo.php | 6 ----- .../Resource/Order/Creditmemo/Collection.php | 8 ------- .../Resource/Order/Creditmemo/Comment.php | 6 ----- .../Order/Creditmemo/Comment/Collection.php | 8 ------- .../Order/Creditmemo/Grid/Collection.php | 8 ------- .../Order/Creditmemo/Item/Collection.php | 8 ------- .../Model/Resource/Order/Grid/Collection.php | 10 --------- .../Sales/Model/Resource/Order/Invoice.php | 6 ----- .../Resource/Order/Invoice/Collection.php | 8 ------- .../Model/Resource/Order/Invoice/Comment.php | 6 ----- .../Order/Invoice/Comment/Collection.php | 8 ------- .../Order/Invoice/Grid/Collection.php | 8 ------- .../Model/Resource/Order/Invoice/Item.php | 6 ----- .../Order/Invoice/Item/Collection.php | 8 ------- .../Mage/Sales/Model/Resource/Order/Item.php | 6 ----- .../Model/Resource/Order/Item/Collection.php | 8 ------- .../Sales/Model/Resource/Order/Payment.php | 6 ----- .../Resource/Order/Payment/Collection.php | 8 ------- .../Resource/Order/Payment/Transaction.php | 12 +++++----- .../Sales/Model/Resource/Order/Shipment.php | 22 +++++-------------- .../Resource/Order/Shipment/Collection.php | 8 ------- .../Model/Resource/Order/Shipment/Comment.php | 6 ----- .../Order/Shipment/Comment/Collection.php | 8 ------- .../Order/Shipment/Grid/Collection.php | 8 ------- .../Model/Resource/Order/Shipment/Item.php | 6 ----- .../Order/Shipment/Item/Collection.php | 8 ------- .../Model/Resource/Order/Shipment/Track.php | 18 +++++---------- .../Order/Shipment/Track/Collection.php | 8 ------- .../Sales/Model/Resource/Order/Status.php | 12 +++++----- .../Order/Status/History/Collection.php | 8 ------- .../Mage/Sales/Model/Resource/Order/Tax.php | 16 +++++--------- .../Model/Resource/Order/Tax/Collection.php | 4 ---- .../Address/Attribute/Frontend/Shipping.php | 12 +++++----- .../Address/Attribute/Frontend/Subtotal.php | 12 +++++----- .../Quote/Address/Attribute/Frontend/Tax.php | 12 +++++----- .../Resource/Quote/Address/Collection.php | 4 ---- .../Resource/Recurring/Profile/Collection.php | 4 ---- .../Sales/Model/Resource/Report/Invoiced.php | 4 ---- .../Sales/Model/Resource/Report/Order.php | 4 ---- .../Model/Resource/Report/Order/Createdat.php | 4 ---- .../Model/Resource/Report/Order/Updatedat.php | 16 +++++--------- .../Sales/Model/Resource/Report/Shipping.php | 16 +++++--------- .../Report/Shipping/Collection/Shipment.php | 16 +++++--------- .../core/Mage/Sales/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Sales/etc/adminhtml.xml | 2 +- app/code/core/Mage/Sales/etc/api.xml | 2 +- app/code/core/Mage/Sales/etc/api2.xml | 2 +- app/code/core/Mage/Sales/etc/config.xml | 2 +- app/code/core/Mage/Sales/etc/system.xml | 10 ++++----- app/code/core/Mage/Sales/etc/widget.xml | 8 +++---- .../sales_setup/upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../sales_setup/upgrade-1.6.0.1-1.6.0.2.php | 7 +++--- .../sales_setup/upgrade-1.6.0.2-1.6.0.3.php | 7 +++--- .../sales_setup/upgrade-1.6.0.3-1.6.0.4.php | 11 ++++------ .../sales_setup/upgrade-1.6.0.4-1.6.0.5.php | 7 +++--- .../sales_setup/upgrade-1.6.0.5-1.6.0.6.php | 6 ++--- .../sales_setup/upgrade-1.6.0.6-1.6.0.7.php | 6 ++--- .../sales_setup/upgrade-1.6.0.7-1.6.0.8.php | 6 ++--- .../sales_setup/upgrade-1.6.0.8-1.6.0.9.php | 7 +++--- .../sales_setup/upgrade-1.6.0.9-1.6.0.10.php | 7 +++--- app/code/core/Mage/SalesRule/Helper/Data.php | 6 ++--- .../SalesRule/Model/Mysql4/Coupon/Usage.php | 12 +++++----- .../Mage/SalesRule/Model/Resource/Coupon.php | 3 --- .../Model/Resource/Coupon/Collection.php | 4 ---- .../SalesRule/Model/Resource/Coupon/Usage.php | 16 +++++--------- .../Model/Resource/Report/Rule/Updatedat.php | 16 +++++--------- .../Model/Resource/Rule/Customer.php | 4 ---- .../Rule/Condition/Product/Subselect.php | 10 ++++++--- .../Mage/SalesRule/Model/Rule/Customer.php | 6 ++--- .../core/Mage/SalesRule/Model/Validator.php | 6 ++--- .../core/Mage/SalesRule/etc/adminhtml.xml | 2 +- app/code/core/Mage/SalesRule/etc/config.xml | 2 +- app/code/core/Mage/SalesRule/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0-1.6.0.1.php | 8 +++---- .../upgrade-1.6.0.1-1.6.0.2.php | 10 ++++----- .../upgrade-1.6.0.2-1.6.0.3.php | 6 ++--- app/code/core/Mage/Sendfriend/Helper/Data.php | 2 +- .../Mage/Sendfriend/Model/Mysql4/Setup.php | 12 +++++----- .../Sendfriend/Model/Resource/Sendfriend.php | 4 ---- .../Mage/Sendfriend/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Sendfriend/etc/config.xml | 2 +- app/code/core/Mage/Sendfriend/etc/system.xml | 10 ++++----- app/code/core/Mage/Shipping/Helper/Data.php | 6 ++--- .../Mage/Shipping/Model/Carrier/Tablerate.php | 14 ++++++------ .../Model/Mysql4/Carrier/Tablerate.php | 12 +++++----- .../Model/Resource/Carrier/Tablerate.php | 9 +++----- .../core/Mage/Shipping/Model/Shipping.php | 11 +++++++--- .../Shipping/Model/Tracking/Result/Status.php | 10 ++++++--- .../controllers/ShippingController.php | 10 ++++++--- .../controllers/TrackingController.php | 13 ++++------- app/code/core/Mage/Shipping/etc/adminhtml.xml | 2 +- app/code/core/Mage/Shipping/etc/config.xml | 2 +- app/code/core/Mage/Shipping/etc/system.xml | 10 ++++----- app/code/core/Mage/Sitemap/Helper/Data.php | 6 ++--- .../Mage/Sitemap/Model/Mysql4/Sitemap.php | 12 +++++----- .../Mage/Sitemap/Model/Resource/Sitemap.php | 16 +++++--------- app/code/core/Mage/Sitemap/Model/Sitemap.php | 14 ++++++------ app/code/core/Mage/Sitemap/etc/adminhtml.xml | 2 +- app/code/core/Mage/Sitemap/etc/config.xml | 2 +- app/code/core/Mage/Sitemap/etc/system.xml | 10 ++++----- .../core/Mage/Tag/Block/Customer/Tags.php | 9 ++++---- .../core/Mage/Tag/Block/Customer/View.php | 6 ++--- app/code/core/Mage/Tag/Helper/Data.php | 6 ++--- app/code/core/Mage/Tag/Model/Api/V2.php | 6 ++--- .../core/Mage/Tag/Model/Indexer/Summary.php | 18 ++++++--------- .../Mage/Tag/Model/Mysql4/Indexer/Summary.php | 12 +++++----- app/code/core/Mage/Tag/Model/Mysql4/Tag.php | 12 +++++----- .../Tag/Model/Resource/Indexer/Summary.php | 16 +++++--------- app/code/core/Mage/Tag/Model/Resource/Tag.php | 16 +++++--------- app/code/core/Mage/Tag/Model/Session.php | 8 +++---- app/code/core/Mage/Tag/Model/Tag.php | 15 ++++++------- app/code/core/Mage/Tag/etc/adminhtml.xml | 2 +- app/code/core/Mage/Tag/etc/api.xml | 2 +- app/code/core/Mage/Tag/etc/config.xml | 2 +- .../Adminhtml/Frontend/Region/Updater.php | 11 +++++++--- .../core/Mage/Tax/Block/Checkout/Shipping.php | 11 +++++----- .../core/Mage/Tax/Block/Checkout/Subtotal.php | 11 +++++----- app/code/core/Mage/Tax/Block/Checkout/Tax.php | 6 ++--- .../core/Mage/Tax/Block/Sales/Order/Tax.php | 6 ++--- app/code/core/Mage/Tax/Helper/Data.php | 6 ++--- app/code/core/Mage/Tax/Model/Calculation.php | 3 --- .../Mage/Tax/Model/Calculation/Rate/Title.php | 14 ++++++------ .../Mage/Tax/Model/Class/Source/Customer.php | 6 ++--- .../Model/Mysql4/Calculation/Rate/Title.php | 12 +++++----- .../core/Mage/Tax/Model/Mysql4/Report/Tax.php | 12 +++++----- .../Mage/Tax/Model/Mysql4/Sales/Order/Tax.php | 12 +++++----- app/code/core/Mage/Tax/Model/Mysql4/Setup.php | 12 +++++----- .../Model/Resource/Calculation/Rate/Title.php | 15 +++++-------- .../Mage/Tax/Model/Resource/Report/Tax.php | 15 +++++-------- .../Model/Resource/Report/Tax/Updatedat.php | 15 +++++-------- .../Tax/Model/Resource/Sales/Order/Tax.php | 15 +++++-------- .../core/Mage/Tax/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Tax/Model/Sales/Order/Tax.php | 14 ++++++------ .../Mage/Tax/Model/Sales/Pdf/Shipping.php | 10 +++++---- .../Mage/Tax/Model/Sales/Pdf/Subtotal.php | 10 ++++++--- .../core/Mage/Tax/Model/Sales/Pdf/Tax.php | 11 +++++++--- .../Sales/Total/Quote/Nominal/Subtotal.php | 10 ++++++--- .../Model/Sales/Total/Quote/Nominal/Tax.php | 10 ++++++--- .../Tax/Model/Sales/Total/Quote/Shipping.php | 12 +++++----- .../Tax/Model/Sales/Total/Quote/Subtotal.php | 10 ++++++--- .../Mage/Tax/Model/Sales/Total/Quote/Tax.php | 10 ++++++--- .../System/Config/Source/Tax/Display/Type.php | 10 +++++---- app/code/core/Mage/Tax/etc/adminhtml.xml | 2 +- app/code/core/Mage/Tax/etc/config.xml | 2 +- app/code/core/Mage/Tax/etc/system.xml | 10 ++++----- .../sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php | 8 +++---- .../sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php | 8 +++---- .../sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php | 6 ++--- app/code/core/Mage/Uploader/Block/Single.php | 14 +++++++----- app/code/core/Mage/Uploader/Helper/Data.php | 6 ++--- .../Mage/Uploader/Model/Config/Uploader.php | 17 ++++++-------- app/code/core/Mage/Uploader/etc/config.xml | 2 +- .../core/Mage/Uploader/etc/jstranslator.xml | 2 +- .../Usa/Block/Adminhtml/Dhl/Unitofmeasure.php | 10 +++------ app/code/core/Mage/Usa/Helper/Data.php | 6 ++--- .../Dhl/International/Source/Method/Size.php | 6 ++--- .../Source/Method/Unitofmeasure.php | 6 ++--- .../Carrier/Dhl/Source/Protection/Value.php | 7 +++--- .../Carrier/Dhl/Source/Shipmenttype.php | 11 +++++++--- .../Carrier/Fedex/Source/Unitofmeasure.php | 6 ++--- .../Mage/Usa/Model/Shipping/Carrier/Ups.php | 9 ++++---- .../Shipping/Carrier/Ups/Backend/Type.php | 7 +++--- .../Shipping/Carrier/Ups/Source/Type.php | 10 +++++---- .../Carrier/Ups/Source/Unitofmeasure.php | 11 +++++++--- .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 8 +++---- .../Shipping/Carrier/Usps/Source/Size.php | 11 +++++++--- app/code/core/Mage/Usa/etc/config.xml | 2 +- .../Usa/etc/dhl/international/countries.xml | 2 +- app/code/core/Mage/Usa/etc/system.xml | 10 ++++----- .../sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php | 7 +++--- .../sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php | 6 ++--- .../core/Mage/Weee/Block/Element/Weee/Tax.php | 11 +++++++--- .../Mage/Weee/Block/Renderer/Weee/Tax.php | 8 +++---- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 8 +++---- .../Mage/Weee/Model/Config/Source/Fpt/Tax.php | 12 +++++++--- .../Mysql4/Attribute/Backend/Weee/Tax.php | 12 +++++----- .../core/Mage/Weee/Model/Mysql4/Setup.php | 12 +++++----- app/code/core/Mage/Weee/Model/Mysql4/Tax.php | 12 +++++----- .../Resource/Attribute/Backend/Weee/Tax.php | 12 +++++----- .../core/Mage/Weee/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Weee/Model/Resource/Tax.php | 16 +++++--------- app/code/core/Mage/Weee/Model/Tax.php | 10 ++++++--- .../Mage/Weee/Model/Total/Creditmemo/Weee.php | 11 +++++++--- .../Mage/Weee/Model/Total/Invoice/Weee.php | 11 +++++++--- .../Weee/Model/Total/Quote/Nominal/Weee.php | 10 ++++++--- .../core/Mage/Weee/Model/Total/Quote/Weee.php | 12 +++++----- app/code/core/Mage/Weee/etc/config.xml | 2 +- app/code/core/Mage/Weee/etc/system.xml | 10 ++++----- .../Mage/Widget/Block/Adminhtml/Widget.php | 6 ++--- .../Widget/Instance/Edit/Chooser/Template.php | 12 +++++----- .../Widget/Instance/Edit/Tab/Settings.php | 12 +++++----- .../Adminhtml/Widget/Instance/Edit/Tabs.php | 16 +++++--------- .../core/Mage/Widget/Model/Mysql4/Widget.php | 12 +++++----- .../Mage/Widget/Model/Resource/Widget.php | 17 +++++--------- .../Widget/Model/Resource/Widget/Instance.php | 4 ---- .../Resource/Widget/Instance/Collection.php | 4 ---- app/code/core/Mage/Widget/Model/Widget.php | 12 +++++----- .../Adminhtml/WidgetController.php | 12 +++++----- app/code/core/Mage/Widget/etc/adminhtml.xml | 2 +- app/code/core/Mage/Widget/etc/config.xml | 2 +- .../core/Mage/Widget/etc/jstranslator.xml | 2 +- .../Mage/Wishlist/Block/Customer/Sharing.php | 6 ++--- .../Mage/Wishlist/Block/Customer/Sidebar.php | 6 ++--- .../Mage/Wishlist/Block/Customer/Wishlist.php | 6 ++--- .../Mage/Wishlist/Block/Share/Wishlist.php | 6 ++--- .../Wishlist/Model/Config/Source/Summary.php | 12 +++++++--- .../Mage/Wishlist/Model/Mysql4/Wishlist.php | 12 +++++----- .../Mage/Wishlist/Model/Resource/Item.php | 4 ---- .../Mage/Wishlist/Model/Resource/Wishlist.php | 12 +++++----- app/code/core/Mage/Wishlist/Model/Session.php | 6 ++--- .../core/Mage/Wishlist/Model/Wishlist.php | 14 ++++++------ .../Wishlist/controllers/SharedController.php | 12 +++++----- app/code/core/Mage/Wishlist/etc/config.xml | 2 +- app/code/core/Mage/Wishlist/etc/system.xml | 10 ++++----- app/code/core/Zend/Db/Select.php | 1 - app/code/core/Zend/Db/Statement.php | 1 - app/code/core/Zend/Mime.php | 2 -- 1232 files changed, 4069 insertions(+), 4667 deletions(-) diff --git a/app/code/core/Mage/Admin/Helper/Block.php b/app/code/core/Mage/Admin/Helper/Block.php index a169b689d43..2423dd0a10e 100644 --- a/app/code/core/Mage/Admin/Helper/Block.php +++ b/app/code/core/Mage/Admin/Helper/Block.php @@ -34,9 +34,6 @@ class Mage_Admin_Helper_Block */ protected $_allowedTypes; - /** - * Construct - */ public function __construct() { $this->_allowedTypes = Mage::getResourceModel('admin/block')->getAllowedTypes(); diff --git a/app/code/core/Mage/Admin/Helper/Variable.php b/app/code/core/Mage/Admin/Helper/Variable.php index 8a65e326329..193e50fd9ff 100644 --- a/app/code/core/Mage/Admin/Helper/Variable.php +++ b/app/code/core/Mage/Admin/Helper/Variable.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) */ /** @@ -34,9 +34,6 @@ class Mage_Admin_Helper_Variable */ protected $_allowedPaths; - /** - * Construct - */ public function __construct() { $this->_allowedPaths = Mage::getResourceModel('admin/variable')->getAllowedPaths(); diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php index 00a92c52c38..8c7f193d65c 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.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/User.php b/app/code/core/Mage/Admin/Model/Acl/Role/User.php index 9308a6feca9..1760a8db6b3 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/User.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/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php index 6509baa14aa..9d7f4657b9b 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User.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/Resource/Block.php b/app/code/core/Mage/Admin/Model/Resource/Block.php index e0f179b684a..3b365e2b5de 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Block.php +++ b/app/code/core/Mage/Admin/Model/Resource/Block.php @@ -39,9 +39,6 @@ class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstra */ protected $disallowedBlockNames = ['install/end']; - /** - * Define main table - */ protected function _construct() { $this->_init('admin/permission_block', 'block_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles.php b/app/code/core/Mage/Admin/Model/Resource/Roles.php index 0f7baa23ac5..fe10b2dce66 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles.php @@ -41,10 +41,6 @@ class Mage_Admin_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstra */ protected $_ruleTable; - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/role', 'role_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php index 43a43f0a02a..4c19fba24ad 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User.php +++ b/app/code/core/Mage/Admin/Model/Resource/User.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) */ /** @@ -27,18 +27,12 @@ */ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/user', 'user_id'); } /** - * Initialize unique fields - * * @return $this */ protected function _initUniqueFields() diff --git a/app/code/core/Mage/Admin/Model/Resource/Variable.php b/app/code/core/Mage/Admin/Model/Resource/Variable.php index 557b40ab8b7..6b2ac4026dc 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Variable.php +++ b/app/code/core/Mage/Admin/Model/Resource/Variable.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) */ /** @@ -27,22 +27,13 @@ */ class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Cache id - */ const CACHE_ID = 'permission_variable'; - /** - * Define main table - */ protected function _construct() { $this->_init('admin/permission_variable', 'variable_id'); } - /** - * Regenerate cache - */ protected function _generateCache() { /** @var Mage_Admin_Model_Resource_Variable_Collection $collection */ diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index 9b8f0a702d0..bbb8bdf1964 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.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/Variable.php b/app/code/core/Mage/Admin/Model/Variable.php index f1787269671..e874d328efa 100644 --- a/app/code/core/Mage/Admin/Model/Variable.php +++ b/app/code/core/Mage/Admin/Model/Variable.php @@ -15,12 +15,16 @@ * @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) */ /** * Class Mage_Admin_Model_Variable * + * @category Mage + * @package Mage_Admin + * @author Magento Core Team + * * @method Mage_Admin_Model_Resource_Variable _getResource() * @method Mage_Admin_Model_Resource_Variable getResource() * @method Mage_Admin_Model_Resource_Variable_Collection getCollection() diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index 467850731a5..eca4b024e4d 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php index 6081a70006f..a3f86f7ca44 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php index 921ee9b9576..c43b5d87640 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php index f1fda22cfad..3419e9d5146 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php index 7dc11b63c71..b7b19bd425a 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml index 6a0edf422c4..8b34a7d0508 100644 --- a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml +++ b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index de8445734bf..71e95727497 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/etc/system.xml b/app/code/core/Mage/AdminNotification/etc/system.xml index b4cd1c29517..8b24cf06c34 100644 --- a/app/code/core/Mage/AdminNotification/etc/system.xml +++ b/app/code/core/Mage/AdminNotification/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php index b1521d329fd..c3f0492b8ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Api_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Mage_Adminhtml_Block_Api_Role_Grid_User constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php index bcd51cf7ef4..c8dc3c34255 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.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_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -39,5 +44,4 @@ public function __construct() ->assign('roles', $roles) ->assign('user_roles', $user_roles); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User.php b/app/code/core/Mage/Adminhtml/Block/Api/User.php index 239624f3e46..a299808a369 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'api_user'; diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php index f0e67aa90c6..6f5379a4c31 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php @@ -21,9 +21,9 @@ /** * Class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles * - * @category Mage - * @package Mage_Adminhtml - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team * * @method Mage_Api_Model_Resource_Role_Collection getCollection() */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php index 65c6225a3b2..6f0e674d8fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Api/Users.php b/app/code/core/Mage/Adminhtml/Block/Api/Users.php index 692ea8118e3..a39b4cb3d14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Users.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Users extends Mage_Adminhtml_Block_Template { - public function __construct() { parent::__construct(); @@ -43,6 +42,5 @@ public function getGridHtml() { return $this->getLayout()->createBlock('adminhtml/api_grid_user')->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php index b0fd6d96394..b379da0e0d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php @@ -15,12 +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) */ /** * Categories tree with checkboxes * + * @category Mage + * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree extends Mage_Adminhtml_Block_Catalog_Category_Tree diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php index 5c68c72e87c..b5adde16d87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index 4bc3547e55f..89a51fb988b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tree extends Mage_Adminhtml_Block_Catalog_Category_Abstract { - protected $_withProductCount; public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php index f4a790b921c..e42cc6b0527 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Form_Renderer_Attribute_Urlkey extends Mage_Adminhtml_Block_Catalog_Form_Renderer_Fieldset_Element { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php index 8638f869833..d7374be1888 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Form_Renderer_Config_YearRange extends Mage_Adminhtml_Block_System_Config_Form_Field { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $element->setStyle('width:70px;') diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php index fdb9a200f4c..35b9853aaee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Edit/Tab/System.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php index b1a018b2e45..0134c3b1083 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tab_System extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $model = Mage::registry('entity_attribute'); @@ -124,5 +122,4 @@ protected function _prepareForm() return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php index 153e4218bc0..14da87a8b35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Attribute_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -63,5 +62,4 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php index fe06da4c675..2dbed2acd83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php index 1e7caa9a0a9..55f0332552a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Action/Attribute/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php index 55bd43e7e2b..dee72c8b2e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Alerts/Stock.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php index d0ad32b1e64..7507e33e8de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Text.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php index 45edbaada74..ded59af7663 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Text 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/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index ea1931f7e63..9c94ea33279 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,10 +28,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group_Abstract { - - /** - * Initialize block - */ public function __construct() { $this->setTemplate('catalog/product/edit/price/tier.phtml'); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php index bc37987ac3c..7e46389e57c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php index 4b710d6ee2e..58c00d8e4d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php index b9f08ca3568..47acec9e352 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Super_Settings extends Mage_ { /** * Prepare block children and data - * */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php index d5e75f3c0f5..af3e198b1f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tag extends Mage_Adminhtml_Block_Widget_Grid { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php index 1840f68e45a..087326324f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Upsell extends Mage_Adminhtml_Block_Widget_Grid { - /** * Set grid params * diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php index 3df824d0472..ef5bcc61608 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Catalog_Product_Edit_Tab_Websites extends Mage_Adminh { protected $_storeFromHtml; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php index 4d112a5ab46..7b69aeebd7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Frontend/Product/Watermark.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php index da54b5b1e37..02e5ddbc12e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Weight.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php index f0eb59c1ca7..3a68a94bf27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php index c7f3783c9b3..ce8470a0fe2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php index 2d7c7862ceb..eaf79f97aed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php @@ -123,8 +123,6 @@ protected function getDeletefolderUrl() } /** - * Description goes here... - * * @return string */ public function getDeleteFilesUrl() diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php index 3ef4dd9a5bd..efa92dd2e38 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Cms_Wysiwyg_Images_Content_Uploader extends Mage_Uploader_Block_Multiple { - /** - * Uploader block constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php index 9b7dba42e87..e5c97daa153 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Wysiwyg_Images_Tree extends Mage_Adminhtml_Block_Template { - /** * Json tree builder * diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index 6b3fb29ae3b..fa36424d3af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php @@ -37,8 +37,6 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region protected $_factory; /** - * Constructor for Mage_Adminhtml_Block_Customer_Edit_Renderer_Region class - * * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php index 86c4ddd50e1..d82795a8c1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Filter_Status extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected static $_statuses; public function __construct() @@ -61,5 +60,4 @@ public function getCondition() return ['eq'=>$this->getValue()]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php index 75d84ab8857..34eae6a6afa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Renderer_Status extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - protected static $_statuses; public function __construct() @@ -55,5 +54,4 @@ public static function getStatus($status) return Mage::helper('customer')->__('Unknown'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php index a9ef0c8b68c..a334514cdd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Tag extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php index 4236d9cde25..0b749fd03ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tags extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php index 241b3d399b2..2cb07ba18b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_View extends Mage_Adminhtml_Block_Template implements Mage_Adminhtml_Block_Widget_Tab_Interface { - protected $_customer; protected $_customerLog; diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php index 6439768505a..f5ed1fafb71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Customer_Edit_Tab_View_Wishlist extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Initial settings - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php index c5f244fe0d3..862a28d9c28 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index 571580367b9..a8557927bae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php index 422c7023323..36e185fc916 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Online_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { return ($row->getCustomerId() > 0 ) ? Mage::helper('customer')->__('Customer') : Mage::helper('customer')->__('Visitor') ; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php index e9916dd0083..fa6ca8791d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php index 99affcf77a5..17261be10e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/System/Config/Validatevat.php b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php index 4403e8bd3b6..8ac357e6aea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Dashboard.php index a617fa3ad01..0c5e31818b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Adminhtml - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Dashboard extends Mage_Adminhtml_Block_Template { diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php index fbce1fa9740..8a2d5db48e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Searches_Top extends Mage_Adminhtml_Block_Dashboard_Grid { protected $_collection; diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php index b08b869153b..1eafece96da 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tab_Products_Viewed extends Mage_Adminhtml_Block_Dashboard_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php index f547464e889..f22c2b13f93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Media/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php index a9c94e4bcc6..ac1bab50015 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,17 +24,10 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team - */ - -/** * @deprecated - * Class Mage_Adminhtml_Block_Media_Uploader */ class Mage_Adminhtml_Block_Media_Uploader extends Mage_Uploader_Block_Multiple { - /** - * Constructor for uploader block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php index f61b909541b..f6f95b2b77d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,21 +25,13 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Newsletter_Subscriber extends Mage_Adminhtml_Block_Template { /** - * Queue collection - * * @var Mage_Newsletter_Model_Resource_Queue_Collection */ protected $_queueCollection = null; - /** - * Constructor - * - * Initializes block - */ public function __construct() { $this->setTemplate('newsletter/subscriber/list.phtml'); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php index 25a38587a74..abecf889957 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Subscriber_Grid_Filter_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected $_websiteCollection = null; protected function _getOptions() @@ -61,5 +60,4 @@ public function getCondition() return ['in'=>$website->getStoresIds(true)]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php index da3ddb1d5b8..75f3554c2b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Template extends Mage_Adminhtml_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 70146847722..ff776421193 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php index d173bf742c0..69cd9b8aed8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +32,8 @@ class Mage_Adminhtml_Block_Notification_Toolbar extends Mage_Adminhtml_Block_Tem * */ protected function _construct() - {} + { + } /** * Retrieve helper diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 241960213b5..ec35f982124 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.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_Notification_Window extends Mage_Adminhtml_Block_Notification_Toolbar { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php index 403abe34bad..e29a7397155 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct - */ public function __construct() { $this->_controller = 'permissions_block'; 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 9ce612ff214..6a9be5cf5cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Construct - */ public function __construct() { $this->_objectId = 'block_id'; 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 268f02522b6..14b4deebdc8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index 5157f68c4a0..bae63ba1353 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -80,6 +79,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edituser', ['id' => $row->getUserId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php index 1204ebf6580..53e451c3123 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -171,6 +170,5 @@ protected function _getUsers($json=false) } } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php index dd64a9765e6..6156bd11700 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.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_Permissions_Tab_Useredit extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(); @@ -159,6 +164,5 @@ protected function _prepareForm() $this->setForm($form); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php index 4cbda45a85b..ed997c42502 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.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_Permissions_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -39,5 +44,4 @@ public function __construct() ->assign('roles', $roles) ->assign('user_roles', $user_roles); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php index 4ce02f71794..888e189f11e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'permissions_user'; @@ -37,8 +36,6 @@ public function __construct() } /** - * Prepare output HTML - * * @return string */ protected function _toHtml() diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php index bdf14eb2369..791fa4afaf5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index cc9089d3633..00e51f58937 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.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_Block_Permissions_UsernRoles extends Mage_Adminhtml_Block_Template { - - public function __construct() { + public function __construct() + { parent::__construct(); $userCollection = Mage::getModel("permissions/users")->getCollection()->load(); $rolesCollection = Mage::getModel("permissions/roles")->getCollection()->load(); @@ -29,5 +35,4 @@ public function __construct() { ->assign('users', $userCollection) ->assign('roles', $rolesCollection); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php index fcc68f45101..dec64fd3365 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Users extends Mage_Adminhtml_Block_Template { - public function __construct() { parent::__construct(); @@ -43,6 +42,5 @@ public function getGridHtml() { return $this->getLayout()->createBlock('adminhtml/permissions_grid_user')->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php index 5971c7d8a1b..a36170ff2dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct - */ public function __construct() { $this->_controller = 'permissions_variable'; 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 bcf9cc56e50..6418a27c12e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Variable_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Construct - */ public function __construct() { $this->_objectId = 'variable_id'; diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php index 6cd57468da5..78e8daf1683 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); 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 fbcb692bf5a..1cf8f1fe608 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 @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php index 4c958fbca39..e6b32d7c134 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php index 46bef5f489c..57d1b3c6f3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php @@ -15,20 +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) */ /** - * description - * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Catalog_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); 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 32b8905a22e..663a924ff0a 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 @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php index 6dd29ea1556..21430dfce0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php index f3698b79813..cbd7d6a942c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php index 5bd6543b8e7..24b54acb75c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php @@ -15,20 +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) */ /** - * description - * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Quote_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php index 5fdf070d556..cda682a613b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Rating/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php index 953353c3d9d..26f85ed73dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -44,14 +43,7 @@ protected function _beforeToHtml() 'content' => $this->getLayout()->createBlock('adminhtml/rating_edit_tab_form')->toHtml(), ]) ; -/* - $this->addTab('answers_section', array( - 'label' => Mage::helper('rating')->__('Rating Options'), - 'title' => Mage::helper('rating')->__('Rating Options'), - 'content' => $this->getLayout()->createBlock('adminhtml/rating_edit_tab_options') - ->append($this->getLayout()->createBlock('adminhtml/rating_edit_tab_options')) - ->toHtml(), - ));*/ + return parent::_beforeToHtml(); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php index c7fedc6d012..a256522ba14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php index 4ba8b3e8ca7..cadfb35bedf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Config_Form_Field_YtdStart extends Mage_Adminhtml_Block_System_Config_Form_Field { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $_months = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php index f5a04d0c030..4c4ca5eca94 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Customer_Totals extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php index 4a3704d6d02..00f0efe6f2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Sold.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php index 431ffe37497..c6c8cef0b63 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sold extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php index bea7e0b0249..42fd2557c0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Viewed extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php index ab1f7c28d94..66e7ac7ceeb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Refresh_Statistics extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php index 4709018b5a1..e8e10653646 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Shipping extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php index 9867370b207..0c8414d8b74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tax extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php index d380fe23330..9b2f438aba2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Template { - public $wishlists_count; public $items_bought; public $shared_count; @@ -57,5 +56,4 @@ public function _beforeToHtml() return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php index 28698eff859..2f281d56473 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { protected function _getOptions() diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php index de830e81e60..66d21a55589 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php index 38f995d4ed0..89fa6da39a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Summary extends Mage_Adminhtml_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php index eb953c33ae2..1902d618cb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php index cb39f83a1b9..06127037a95 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sidebar extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { protected function _prepareLayout() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php index 11c03527a78..a1f3cf2edf5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Create_Sidebar_Viewed extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { - protected function _construct() { parent::_construct(); @@ -59,5 +58,4 @@ public function getHeaderText() { return Mage::helper('sales')->__('Recently Viewed'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php index 58ebbefdd42..cd7783f006f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Store.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php index 05b2c8b928e..cd661b5a071 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Store 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/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php index abd0bd555bb..756d1179452 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Totals extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { protected $_totalRenderers; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php index b1e16044324..d077bc26262 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.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_Shipping extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php index a6fd21a61cb..9e7031bd924 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.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) */ /** * 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_Subtotal extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php index 94485c09454..e6d566af9f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Totals_Table extends Mage_Adminhtml_Block_Template { - protected $_websiteCollection = null; public function __construct() @@ -36,5 +34,4 @@ public function __construct() parent::__construct(); $this->setId('sales_order_create_totals_table'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php index c78e3ca1e28..ba3bcb287f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.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) */ /** * Tax Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Tax extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php index 41b2958e2f5..c9697aec277 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php index 005bb14040a..924629de361 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php index e08a637cb61..a017233d321 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php index 69ac013d0b7..fa8065b96d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php index 1bbb9c96460..536988732f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php index d419712fc24..198c0bec35c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php index eaade37892c..fa8704013c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php index 296c3078ecf..08cb3af1d92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php index c4ae47ab076..8d36de5c4de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Totalbar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php index 5d2ac672014..0475777b8ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Totalbar extends Mage_Adminhtml_Block_Sales_Order_Abstract { protected $_totals = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php index fc6b3692e4c..73f3673bec7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php index 1b7a2d9cfc3..daa70c8754c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index f74ab1602fc..5bb49d77a27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Shipments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php index dd839937418..95c416793a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Transactions.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php index 3c2330d9068..1ca471937dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php index 13d44efd69d..fde493d4202 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php index ba975a2d871..434fbd47611 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Shipment extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'sales_shipment'; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php index 1168962f512..76deeffa9ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.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_Totals extends Mage_Sales_Block_Order_Totals { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php index 23d6bf49d69..6f297b51e39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sitemap.php index 58a452985ad..a5738a4c397 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sitemap + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** * Block constructor */ @@ -37,5 +37,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('sitemap')->__('Add Sitemap'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php index a2590fbc7d7..1a353a8d533 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sitemap + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Time extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index b7e9019af90..caebfca8c71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Fieldset/Order/Statuses.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php index e12f6673f78..2b2b4e4bbbf 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.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_Order_Statuses extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { @@ -77,5 +82,4 @@ protected function _getFieldHtml($fieldset, $id, $status) return $field->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php index 198e9526c51..404115b0432 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.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_Switcher extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php index 21740ef1042..223aeafb88a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index db07b5c4330..20b28b7570d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_System_Config_Tabs extends Mage_Adminhtml_Block_Widget { /** - * Tabs - * * @var array */ protected $_tabs; diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php index 8e4a5a3f6a7..b5405d00742 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Upload extends Mage_Adminhtml_Block_Widget_Form { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php index 3b4cc204f80..ac93e907b38 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php index b9e5aa52664..bf982630a27 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Wizard extends Mage_Adminhtml_Block_Widget_Container { - protected $_storeModel; protected $_attributes; protected $_addMapButtonHtml; @@ -226,6 +225,5 @@ public function getShortDateFormat() } return $this->_shortDateFormat; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php index 25db178c071..125d7ea86cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_System_Convert_Gui_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tabs constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php index a7956b633ad..e5252efef9c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_System_Convert_Profile_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tabs constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php index bac2595e1ee..9f7e538f4ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php index 458a2495616..82499cc554f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php index 4235c2db08c..c76ee215cbd 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,12 +25,10 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Email_Template extends Mage_Adminhtml_Block_Template { /** * Set transactional emails grid template - * */ protected function _construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php index a939f249213..f1c2b2ba847 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php index 51babf7a194..c9ff9aef92a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php index d29da72123f..f3a165e73d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Website extends Mage_Adminhtml_Block_Template { - protected function _prepareLayout() { $itemId = $this->getRequest()->getParam('website_id'); @@ -61,5 +60,4 @@ protected function _prepareLayout() ); return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php index 31ba4208963..f2d5d86913a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php index e55907e2a16..e16ef5bf66b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,16 +26,13 @@ * @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_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { return '' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . ''; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php index 73c4f4f384c..ab9d883815d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Store extends Mage_Adminhtml_Block_Widget_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php index d2556111d23..b52d3986ed1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Variable.php b/app/code/core/Mage/Adminhtml/Block/System/Variable.php index 11ad214a98b..ed1a5304ff0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,12 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Variable extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Block constructor - */ public function __construct() { $this->_controller = 'system_variable'; diff --git a/app/code/core/Mage/Adminhtml/Block/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag.php index de51f353196..463cb341390 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php index ddf5792a731..34cb7a014e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php index 954f2273f6c..3cfb6e52f48 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tag extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'tag_tag'; diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php index 4dd29bb0124..b2ecef91ac9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.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) */ /** * Tax Rate Titles Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Tax_Rate_Title extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php index d71f3fa1e3d..c620ad9f767 100644 --- a/app/code/core/Mage/Adminhtml/Block/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php index 0a45ab1866e..dd2f1472f81 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index 80f9fd088c3..594dc195e1a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Widget.php index 2ea12319960..48b4f2c25e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php index 273935a7f5f..9b914f111f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Widget_Grid_Column_Filter_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract { - /** * Render HTML of the element * @@ -107,5 +106,4 @@ public function getCondition() return ['eq' => $this->getValue()]; } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php index 7b0eeb8a8eb..7c5389e221f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php index d2f144c99a1..12f1c62b605 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php index 2fdb444cb7f..45cbc57c247 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php index 5190fa392a5..420deb6afd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Text extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php index dadd926eef4..caf1762a076 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Renderer/Wrapline.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php index 7c07e196536..cb3aaf6e523 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php index a5fd32deb04..13b71831a0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.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) */ /** - * Tabs block - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team @@ -28,8 +26,6 @@ class Mage_Adminhtml_Block_Widget_Tabs extends Mage_Adminhtml_Block_Widget { /** - * tabs structure - * * @var array */ protected $_tabs = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php index d6a0b4a01a8..9c270c1bf52 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.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_Tree extends Mage_Adminhtml_Block_Template { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php index 77a9b0dba43..6eecd8365cf 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.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) */ /** * Adminhtml sales orders controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Controller_Sales_Shipment extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/Model/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/Email/Template.php index ca74672d99d..1412742d747 100644 --- a/app/code/core/Mage/Adminhtml/Model/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/Email/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_Email_Template extends Mage_Core_Model_Email_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php index 65569ddc438..c29aab60bdd 100644 --- a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,9 +67,6 @@ class Mage_Adminhtml_Model_LayoutUpdate_Validator extends Zend_Validate_Abstract */ protected $_protectedExpressions = []; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php index 1ddb4e54ec0..34fc4600b30 100644 --- a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_Newsletter_Renderer_Text implements Varien_Data_Form_Element_Renderer_Interface { - public function render(Varien_Data_Form_Element_Abstract $element) { $html = ''."\n"; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php index afb210faab9..4736f70f4da 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Admin/Usecustompath.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php index cbc3b8e6b0a..a6e074ff124 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Admin/Usesecretkey.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php index 8e67743c71c..10ffd254c64 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php index 27915899eb2..d612565b221 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Address/Street.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php index c4d5cd98462..8d612946404 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php index 6701abb4a03..296203aa1fe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php index 0cb123675ab..f03eb7bf151 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_System_Config_Backend_Shipping_Tablerate extends Mage_Core_Model_Config_Data { public function _afterSave() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php index 2f3d681ec6d..7372905da84 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.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_Sitemap extends Mage_Core_Model_Config_Data { - protected function _beforeSave() { $value = $this->getValue(); @@ -31,5 +35,4 @@ protected function _beforeSave() } return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php index 95d6fb5095c..5a89940fe17 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Symlink.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php index 4fa10419b1b..fba9fed24ab 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php @@ -15,14 +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) */ /** * System config symlink backend model * - * @category Mage - * @package Mage_Adminhtml + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Backend_Symlink extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php index 03616e280e0..ccfff30edd0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php index 2f276d98723..d9d41a9a483 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Catalog/TimeFormat.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php index 41fc2502484..b3ba5fa77a1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.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_Catalog_TimeFormat { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php index c04640105e5..3cffe9aeb4f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Date/Short.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php index fd68ce29f1d..2dbc265b208 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.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_Date_Short { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php index bf44985e92a..eeecec83a81 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.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_Email_Smtpauth { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php index a3a190541a0..51656965257 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php index d1f48999797..4023b64486c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.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) */ /** * Locale timezone source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php index 6bc84c2ffdd..7b965a32c64 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.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) */ /** * Locale weekdays source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php index c365f20d1c4..93bf69f3c74 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.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) */ /** * Locale timezone source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php index ab1c6e30a86..46f544aab53 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.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) */ /** * Order Statuses source model + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Order_Status { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php index 8ede3ee2751..2fede8367f8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.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_Price_Step { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php index c9cf72614ee..0ea0b81ec83 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Product/Thumbnail.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php index 01bbedd062c..11f7f985c0e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_System_Config_Source_Product_Thumbnail { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php index d44cf8455a3..c42d0d4e83e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.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_Tablerate { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php index e78a484b139..fcd78c287ca 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php @@ -15,13 +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_Shipping_Taxclass { public function toOptionArray() { - //array_unshift($options, array('value'=>'', 'label' => Mage::helper('tax')->__('None'))); return Mage::getModel('tax/class_source_product')->toOptionArray(); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php index 54a5aff552f..962bec65072 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php @@ -15,17 +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) */ /** * Generate options for media storage selection + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage { /** - * Options getter - * * @return array */ public function toOptionArray() @@ -41,5 +43,4 @@ public function toOptionArray() ] ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php index 7897a9ecb10..5c98109ca77 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.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_Store { protected $_options; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php index 6cd7fa0d410..9b78c1f7b51 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.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_Website { protected $_options; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php index a3ed3b1dc95..244df0ec907 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php @@ -15,19 +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) */ /** * Used in creating options for Yes|No config value selection * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Yesno { - /** - * Options getter - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php index 8da5347395b..20a1a715a02 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php @@ -15,19 +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) */ /** * Used in creating options for Yes|No|Specified config value selection * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Yesnocustom { - /** - * Options getter - * * @return array */ public function toOptionArray() @@ -38,5 +38,4 @@ public function toOptionArray() ['value' => 2, 'label'=>Mage::helper('adminhtml')->__('Specified')] ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php index 6c2c62fc8c8..d0120d58a00 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_System_Store extends Varien_Object { - /** * Website collection * websiteId => Mage_Core_Model_Website diff --git a/app/code/core/Mage/Adminhtml/Model/Url.php b/app/code/core/Mage/Adminhtml/Model/Url.php index ccdf95c8c9a..92a877a095c 100644 --- a/app/code/core/Mage/Adminhtml/Model/Url.php +++ b/app/code/core/Mage/Adminhtml/Model/Url.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_Url extends Mage_Core_Model_Url { diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index eedfd51494a..446fdfb2051 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.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_Api_UserController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php index a632fd33ca4..f1f718f211f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php index 9c96b851623..e9d2e914be0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php index 0d47433f0a0..b14b4763904 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Cms/Block/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php index 0071f2ed820..c49745378d7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Cms/Page/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php index fb327e79276..fbb678d0d3b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Cms/WysiwygController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php index 83f426962cb..2c7c2f656e9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/System/Config/ValidatevatController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php index d33684f956c..04fd77cbefe 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php index 7e2bda773a3..20f6b7308d9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php index 6dd6ea92538..2cb4b17c668 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php index 59e0911348c..41e376b22b9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php index 669f219e489..46602d02636 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Manage Newsletter Template Controller @@ -31,7 +31,7 @@ class Mage_Adminhtml_Newsletter_TemplateController extends Mage_Adminhtml_Contro * * @return bool */ - protected function _isAllowed () + protected function _isAllowed() { return Mage::getSingleton('admin/session') ->isAllowed('newsletter/template'); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index e39d67a0e25..3cecb277236 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.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_Permissions_UserController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php index 53c57972d51..4bb355027c5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index e71be08052b..7d768ca9940 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.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_Promo_WidgetController extends Mage_Adminhtml_Controller_Action { /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index 8f0276afdf2..57287950561 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Report/StatisticsController.php b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php index 4ae00c23f10..e456bbeb1e0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php index 0b0b0f22caa..9ef42891d7b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index 6dd095e8dcb..744dab5fef1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php index 426bd3e637e..4f336ed639c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php index 3d4c76b396d..a6bf11334d4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.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) */ /** * Adminhtml sales orders controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Sales_ShipmentController extends Mage_Adminhtml_Controller_Sales_Shipment { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php index d9ef67197d5..8401b70c947 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.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) */ /** * Adminhtml sales transactions controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Sales_TransactionsController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index 4ed70d938b4..6778d65520a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sitemap + * @author Magento Core Team */ class Mage_Adminhtml_SitemapController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php index ea8306cfbb7..c1bbfe6936e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php index fdf7a3acb45..5e0ca4720e9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 091f3dab16d..0e743d6d5c6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -504,6 +504,5 @@ protected function _addDeletionNotice($typeTitle) ); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php index c48f964595a..561fbef304f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php index 4588d51a86c..153f4a967f5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 22dde0a2d06..165f5944d9a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_TagController extends Mage_Adminhtml_Controller_Action { - protected function _initAction() { $this->loadLayout() diff --git a/app/code/core/Mage/Adminhtml/controllers/TaxController.php b/app/code/core/Mage/Adminhtml/controllers/TaxController.php index e915f31eed7..142c34dc75e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TaxController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php index bc2c92f8ff7..644f2673ba0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml index d6a3eb61ab7..9963688907a 100644 --- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml +++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 8cd7aef93c8..b5f1a47694d 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml b/app/code/core/Mage/Adminhtml/etc/jstranslator.xml index 0448a7e3086..c7df21aeda1 100644 --- a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml +++ b/app/code/core/Mage/Adminhtml/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php index f96a21c2e9b..a506589c2d4 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.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,7 +23,7 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface { diff --git a/app/code/core/Mage/Api/Model/Acl/Role/User.php b/app/code/core/Mage/Api/Model/Acl/Role/User.php index fbd1c879cd3..19c900d9244 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/User.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_User extends Mage_Api_Model_Acl_Role_Generic { - } diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php index 6e026c13de7..1410b03073f 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User.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_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) */ /** * ACL user resource * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team * @deprecated */ class Mage_Api_Model_Mysql4_User extends Mage_Api_Model_Resource_User diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php index c39549046f8..b3a4c52a372 100644 --- a/app/code/core/Mage/Api/Model/Resource/User.php +++ b/app/code/core/Mage/Api/Model/Resource/User.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_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) */ /** * ACL user resource * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team */ class Mage_Api_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('api/user', 'user_id'); diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 8a3394c6a51..903381f3204 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.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/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index 2969e3ecdd6..243f6d55aeb 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.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/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php index 31c39ffe3c1..6e7921e61cf 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.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/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php index 9de8200f638..e92e0063dd4 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.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/User.php b/app/code/core/Mage/Api/Model/User.php index 59601aa2030..5a7074c248d 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.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_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 model * + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_User _getResource() * @method Mage_Api_Model_Resource_User getResource() * @method string getFirstname() @@ -56,33 +60,22 @@ * @method array getRoleIds() * @method $this setLogdate(string $value) * - * @category Mage - * @package Mage_Api - * @author Magento Core Team - * * @method $this setRoleIds(array $value) * @method $this setRoleUserId(int $value) */ class Mage_Api_Model_User extends Mage_Core_Model_Abstract { /** - * Prefix of model events names - * * @var string */ protected $_eventPrefix = 'api_user'; - /** - * Constructor - */ protected function _construct() { $this->_init('api/user'); } /** - * Save user - * * @return $this */ public function save() diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php index e957bd98a55..e19e26f93c5 100644 --- a/app/code/core/Mage/Api/controllers/SoapController.php +++ b/app/code/core/Mage/Api/controllers/SoapController.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/controllers/V2/SoapController.php b/app/code/core/Mage/Api/controllers/V2/SoapController.php index 4b1120509cc..be3b852227a 100644 --- a/app/code/core/Mage/Api/controllers/V2/SoapController.php +++ b/app/code/core/Mage/Api/controllers/V2/SoapController.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/controllers/XmlrpcController.php b/app/code/core/Mage/Api/controllers/XmlrpcController.php index 1fa793f5c00..219eaae92e2 100644 --- a/app/code/core/Mage/Api/controllers/XmlrpcController.php +++ b/app/code/core/Mage/Api/controllers/XmlrpcController.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/etc/adminhtml.xml b/app/code/core/Mage/Api/etc/adminhtml.xml index 37fd21b13ba..f8a62b1e03a 100644 --- a/app/code/core/Mage/Api/etc/adminhtml.xml +++ b/app/code/core/Mage/Api/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml index 610fbe99087..a8283760156 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index b4a80e9930b..2ab15aeb9ab 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml index 06ed95b6369..90ae8fa42f6 100644 --- a/app/code/core/Mage/Api/etc/system.xml +++ b/app/code/core/Mage/Api/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php index 62e0629497f..464623716e7 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct grid container - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php index 1996fc98f81..9cf5f6d60f6 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Attribute_Buttons extends Mage_Adminhtml_Block_Template { - /** - * Construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php index 1e8a8a653a9..163adfbb017 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.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) */ /** @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Attribute_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php index 3332b4b0b5a..18dc2ee8911 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct grid container - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php index 4a201eb2f07..ebf1e13c510 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php @@ -30,9 +30,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles_Buttons extends Mage_Adminhtml_Block_Template { - /** - * Construct - */ public function __construct() { parent::__construct(); 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 035f387b7cf..40809c16d67 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Construct grid block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php index f098dc4385c..1c3f3fb6e3e 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.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_Users setRole(Mage_Api2_Model_Acl_Global_Role $role) * @method Mage_Api2_Block_Adminhtml_Roles_Tab_Users setUsers(array $users) @@ -31,9 +32,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles_Tab_Users extends Mage_Adminhtml_Block_Widget_Grid implements Mage_Adminhtml_Block_Widget_Tab_Interface { - /** - * Construct grid block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php index 64e513b98e3..9b150ae4cb3 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.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,15 +24,12 @@ * @category Mage * @package Mage_Api2 * @author Magento Core Team + * * @method Mage_Api2_Block_Adminhtml_Roles_Tabs setRole(Mage_Api2_Model_Acl_Global_Role $role) * @method Mage_Api2_Model_Acl_Global_Role getRole() */ class Mage_Api2_Block_Adminhtml_Roles_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php index fd53ce42858..a439457d80e 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.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.php b/app/code/core/Mage/Api2/Model/Auth/User.php index 52b5cbf36ab..e6318b434eb 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User.php +++ b/app/code/core/Mage/Api2/Model/Auth/User.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_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) */ /** * API auth user * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Auth_User { diff --git a/app/code/core/Mage/Api2/Model/Renderer/Xml.php b/app/code/core/Mage/Api2/Model/Renderer/Xml.php index a7cf5537c78..8b69d59549d 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml.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/Renderer/Xml/Writer.php b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php index b578e39140a..09c3077c6d6 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.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/Request/Interpreter/Xml.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php index 86cf45d24de..febaa8a0ba3 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.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_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) */ /** * Request content interpreter XML adapter * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Request_Interpreter_Xml implements Mage_Api2_Model_Request_Interpreter_Interface { diff --git a/app/code/core/Mage/Api2/Model/Resource/Setup.php b/app/code/core/Mage/Api2/Model/Resource/Setup.php index c848dd2e2c1..c43b6c6fd98 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Setup.php +++ b/app/code/core/Mage/Api2/Model/Resource/Setup.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_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) */ /** * API2 setup model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator.php b/app/code/core/Mage/Api2/Model/Resource/Validator.php index 33452694330..6808aa234c2 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator.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/etc/adminhtml.xml b/app/code/core/Mage/Api2/etc/adminhtml.xml index 16c1a36c765..c7e5842c243 100644 --- a/app/code/core/Mage/Api2/etc/adminhtml.xml +++ b/app/code/core/Mage/Api2/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/etc/config.xml b/app/code/core/Mage/Api2/etc/config.xml index 7f482ebaae8..5efd801b773 100644 --- a/app/code/core/Mage/Api2/etc/config.xml +++ b/app/code/core/Mage/Api2/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php index fb3c6a1d92f..42264c36b7e 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.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/etc/config.xml b/app/code/core/Mage/Authorizenet/etc/config.xml index b1e2bfafb6b..15e61f639dc 100644 --- a/app/code/core/Mage/Authorizenet/etc/config.xml +++ b/app/code/core/Mage/Authorizenet/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Authorizenet/etc/system.xml b/app/code/core/Mage/Authorizenet/etc/system.xml index 9ee29dae61b..8e9645dc848 100644 --- a/app/code/core/Mage/Authorizenet/etc/system.xml +++ b/app/code/core/Mage/Authorizenet/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php index 2068d8fb1e0..7e2c7472c35 100644 --- a/app/code/core/Mage/Backup/Helper/Data.php +++ b/app/code/core/Mage/Backup/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Backup - * @author Magento Core Team + * @category Mage + * @package Mage_Backup + * @author Magento Core Team */ class Mage_Backup_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Backup/Model/Config/Source/Type.php b/app/code/core/Mage/Backup/Model/Config/Source/Type.php index e8c4455be95..7d085fc7713 100644 --- a/app/code/core/Mage/Backup/Model/Config/Source/Type.php +++ b/app/code/core/Mage/Backup/Model/Config/Source/Type.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_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) */ /** diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml index 6d76a915b9b..46465d681aa 100644 --- a/app/code/core/Mage/Backup/etc/adminhtml.xml +++ b/app/code/core/Mage/Backup/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index 2dcbbedafb1..1c2252d5d7c 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/etc/system.xml b/app/code/core/Mage/Backup/etc/system.xml index 9970d5559ad..5fc08afeea1 100644 --- a/app/code/core/Mage/Backup/etc/system.xml +++ b/app/code/core/Mage/Backup/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php index 4ed8e1423d2..4f9deecd99c 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.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 Special Price Attribute Block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method $this setDisableChild(bool $value) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php index c00e298983d..ec5b9e0c2e0 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.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) */ /** * Adminhtml product edit tabs * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tabs extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php index 6b17e3092a3..423cb5e5b5f 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.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) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php index ff37c1ae623..7fa0ec1310d 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.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 Stock Status Indexer 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_Indexer_Stock extends Mage_Bundle_Model_Resource_Indexer_Stock diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php index fd987646efd..0849dec664a 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.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 Price View Attribute Renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Product_Attribute_Source_Price_View extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 08eac48abac..0ce895f0952 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.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 Type Model * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Product_Type extends Mage_Catalog_Model_Product_Type_Abstract { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php index 1b379ccdee8..385f56539c0 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.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 Stock Status Indexer 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_Indexer_Stock extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option.php b/app/code/core/Mage/Bundle/Model/Resource/Option.php index 2ff33435082..a826acf68d3 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option.php @@ -27,18 +27,12 @@ */ class Mage_Bundle_Model_Resource_Option extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource - * - */ protected function _construct() { $this->_init('bundle/option', 'option_id'); } /** - * After save process - * * @param Mage_Core_Model_Abstract|Mage_Bundle_Model_Option $object * @return $this */ 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 ed4aff38f52..90e0835ff3c 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php @@ -48,9 +48,6 @@ class Mage_Bundle_Model_Resource_Price_Index extends Mage_Core_Model_Resource_Db */ protected $_customerGroups; - /** - * Initialize connection and define main table - */ protected function _construct() { $this->_init('bundle/price_index', 'entity_id'); diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection.php index b64da262901..c2f7867e0da 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection.php @@ -27,10 +27,6 @@ */ class Mage_Bundle_Model_Resource_Selection extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and id field - * - */ protected function _construct() { $this->_init('bundle/selection', 'selection_id'); diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php index 8aeeea9682c..8e85fdfb0ed 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.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) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php index 47874614e07..0c3dc6dc3a7 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.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) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php index 527c37c1a85..465278f65dc 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.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) */ /** diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 19dac6b3fbf..010b11ba40f 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 35493640928..d55e1ffc0fb 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.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_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) */ /** @var Mage_Catalog_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php index 7e69ae9d3a4..d3f384e4f79 100644 --- a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php +++ b/app/code/core/Mage/Captcha/Block/Captcha/Zend.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/Resource/Log.php b/app/code/core/Mage/Captcha/Model/Resource/Log.php index 8b907fee3ba..c491fc60423 100644 --- a/app/code/core/Mage/Captcha/Model/Resource/Log.php +++ b/app/code/core/Mage/Captcha/Model/Resource/Log.php @@ -37,10 +37,6 @@ class Mage_Captcha_Model_Resource_Log extends Mage_Core_Model_Resource_Db_Abstra */ const TYPE_LOGIN = 2; - /** - * Define main table - * - */ protected function _construct() { $this->_setMainTable('captcha/log'); diff --git a/app/code/core/Mage/Captcha/Model/Zend.php b/app/code/core/Mage/Captcha/Model/Zend.php index 7733aacdc53..de983173ca9 100644 --- a/app/code/core/Mage/Captcha/Model/Zend.php +++ b/app/code/core/Mage/Captcha/Model/Zend.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/etc/config.xml b/app/code/core/Mage/Captcha/etc/config.xml index ca9b1944974..247afc28c82 100644 --- a/app/code/core/Mage/Captcha/etc/config.xml +++ b/app/code/core/Mage/Captcha/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Captcha * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Captcha/etc/system.xml b/app/code/core/Mage/Captcha/etc/system.xml index 5a18b82c5a6..64848c2a42c 100644 --- a/app/code/core/Mage/Captcha/etc/system.xml +++ b/app/code/core/Mage/Captcha/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Captcha - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Captcha + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index e083f46452c..e312882e584 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.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_Category_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index 2e87ad466c1..2f83c3d92a3 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.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/Layer/View.php b/app/code/core/Mage/Catalog/Block/Layer/View.php index a5370a58a81..edbc311622a 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/View.php +++ b/app/code/core/Mage/Catalog/Block/Layer/View.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 layered navigation view block * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Layer_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php index a2ee128840c..a3c1019ca96 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.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/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php index 819f7e07139..d7a95c96a42 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.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 list toolbar * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method string getDefaultGridPerPage() * @method string getDefaultListPerPage() diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index 32357aa4467..d5492c5a139 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.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,9 +23,8 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Catalog_Block_Product_List_Upsell extends Mage_Catalog_Block_Product_Abstract { /** diff --git a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php b/app/code/core/Mage/Catalog/Block/Product/Price/Template.php index 7886429c9e5..a785fe2aba9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price/Template.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 Price Template Block * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Product_Price_Template extends Mage_Core_Block_Abstract { diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php index 36e79c5557a..b7ba6988e95 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -12,19 +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 View block * - * @category Mage - * @package Mage_Catalog - * @module Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method int getProductId() * @method $this setCustomAddToCartUrl(string $value) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php index a5dfb733010..39b53fa6f8b 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.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,7 +27,6 @@ */ class Mage_Catalog_Block_Product_View_Options_Type_Text extends Mage_Catalog_Block_Product_View_Options_Abstract { - /** * Returns default value to show in text input * diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php index 535370477e7..49339442ea2 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.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/Simple.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php index c45f9b4c99c..801ff281ffa 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.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_Simple extends Mage_Catalog_Block_Product_View_Abstract { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php index 8cf51accdac..1ee78f2d074 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.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,9 +23,8 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Product_View_Type_Virtual extends Mage_Catalog_Block_Product_View_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index f6002fd2f2f..0dd27819814 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.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/Product/View.php b/app/code/core/Mage/Catalog/Helper/Product/View.php index 1959906f982..7d0dae1b040 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/View.php +++ b/app/code/core/Mage/Catalog/Helper/Product/View.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 category helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Helper_Product_View extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php index a6236759a72..c17d8a23601 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.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/Category/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php index 3c5683fa995..c7321137fdb 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.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/Category/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php index 063098c86f1..c228428592c 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.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/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php index ee91e1c9503..aa4148def29 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.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/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php index f3f83eda8b2..accb10def65 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.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/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php index 298b095fa6a..c79bfbe95cb 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.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/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php index 94725fd4e0e..d175876f169 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.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/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php index 39cbd067936..a485ca248cd 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.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/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php index 975ab084346..b8466dbe549 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.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/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php index 47a1138b2fc..a25f098675f 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.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/Website/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php index 25c51bd9aee..0930e2d38ce 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.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/Website/Validator/Admin/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php index 91c4ce5ec62..7143e07a204 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.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/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php index 0bee70c4127..2dacd827736 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.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/Category/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php index f410403cb86..bf7267f39eb 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.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/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php index f62c317b949..16a819fc549 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.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/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php index 4eeca6765cb..c2ce2b7e91a 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.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_Model_Category_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php index 5bcdf254287..1b799c9e46d 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.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/Category/Url.php b/app/code/core/Mage/Catalog/Model/Category/Url.php index cc492ab2686..35157375fa6 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Url.php +++ b/app/code/core/Mage/Catalog/Model/Category/Url.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/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php index 37a882a7cff..89fd79f97fc 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php @@ -32,11 +32,6 @@ class Mage_Catalog_Model_Convert_Adapter_Product extends Mage_Eav_Model_Convert_ const MULTI_DELIMITER = ' , '; const ENTITY = 'catalog_product_import'; - /** - * Event prefix - * - * @var string - */ protected $_eventPrefix = 'catalog_product_import'; /** diff --git a/app/code/core/Mage/Catalog/Model/Indexer/Url.php b/app/code/core/Mage/Catalog/Model/Indexer/Url.php index 51135184b93..6a95fa77c49 100644 --- a/app/code/core/Mage/Catalog/Model/Indexer/Url.php +++ b/app/code/core/Mage/Catalog/Model/Indexer/Url.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) */ /** @@ -26,6 +26,10 @@ * - Store save (new store creation, changed store group) - require reindex all data * - Store group save (changed root category or group website) - require reindex all data * - Seo config settings change - require reindex all data + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Indexer_Url extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php index ab105eb4898..cb7834d7c24 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/State.php +++ b/app/code/core/Mage/Catalog/Model/Layer/State.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) */ /** * Layered navigation state model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Layer_State extends Varien_Object { diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php index 634cfe96efe..16bbefd0bdc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.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/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php index 252aa8fee34..79a646e18d3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.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/Backend/Sku.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php index 64f711b6d16..cb5884dbb9b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.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/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php index 21ebe1dc026..ee199808082 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.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/Backend/Startdate/Specialprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php index 1fbff77088a..da75925ff37 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.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,9 +24,8 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Catalog_Model_Product_Attribute_Backend_Startdate_Specialprice extends Mage_Catalog_Model_Product_Attribute_Backend_Startdate { /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php index f77b46fe083..b33cb1af048 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.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/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php index 3db387f0534..23cdf6977ba 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.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_Model_Product_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php index f841178662f..37862351d98 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.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/Set/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php index c83c4fdf820..71580c6dacd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.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/Source/Msrp/Type.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php index 10e8caff9f7..84538c1a69a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.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/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php index 92485e2ea3f..e74617adaea 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.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/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php index 6fb0a160f18..3f7bdbf6b32 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.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/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php index b7b1db9439d..151beb62f46 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.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 28bd80eaaa1..fa538ee6cb0 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 @@ -53,8 +53,6 @@ class Mage_Catalog_Model_Product_Option_Type_Default extends Varien_Object protected $_product; /** - * description - * * @var mixed */ protected $_productOptions = []; diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php index f912964c8d3..b5c89c0f86e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.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/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php index e350313ec11..14295f90c65 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.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 option select type model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Option_Value _getResource() * @method Mage_Catalog_Model_Resource_Product_Option_Value getResource() * @method int getOptionId() @@ -35,10 +39,6 @@ * @method float getStorePrice() * @method string getStoreTitle() * @method string getTitle() - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Option_Value extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php index ad36b9db4cb..b012c509382 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.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/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php index cca3d326562..63208666e9f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Product/Status.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) */ /** * Product status functionality model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Status _getResource() * @method Mage_Catalog_Model_Resource_Product_Status getResource() * @method int getProductId() @@ -29,10 +33,6 @@ * @method Mage_Catalog_Model_Product_Status setStoreId(int $value) * @method int getVisibility() * @method Mage_Catalog_Model_Product_Status setVisibility(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Status extends Mage_Core_Model_Abstract { @@ -46,9 +46,6 @@ class Mage_Catalog_Model_Product_Status extends Mage_Core_Model_Abstract */ protected $_attribute; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('catalog/product_status'); diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php index f8494fe3a44..c23058d169a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type.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 type model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Type { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php index d7ee94ca0cf..f772ac2f2e2 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.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/Simple.php b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php index 4ba07147823..e68adde7482 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.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) */ /** * Simple product type implementation * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Type_Simple extends Mage_Catalog_Model_Product_Type_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php index 5e509e2c15e..a6a924a1dc3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.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/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php index c920d6123c0..11dd845e3b9 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Url.php +++ b/app/code/core/Mage/Catalog/Model/Product/Url.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/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php index 46ae4898553..9fcc4bc9166 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php +++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.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/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php index ab51135b1a5..4cea4379898 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Product/Website.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_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 Website Model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Website _getResource() * @method Mage_Catalog_Model_Resource_Product_Website getResource() * @method int getWebsiteId() * @method Mage_Catalog_Model_Product_Website setWebsiteId(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Website extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php index 7c7978b2ec5..b8d795354f0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php @@ -32,15 +32,11 @@ class Mage_Catalog_Model_Resource_Category_Collection extends Mage_Catalog_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_category_collection'; /** - * Event object name - * * @var string */ protected $_eventObject = 'category_collection'; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php index 0f110583a0e..5e45d6632d9 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php @@ -28,15 +28,11 @@ class Mage_Catalog_Model_Resource_Category_Flat_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_category_collection'; /** - * Event object name - * * @var string */ protected $_eventObject = 'category_collection'; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php index a6d0403dd07..6a450ceea3f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php @@ -69,10 +69,6 @@ class Mage_Catalog_Model_Resource_Category_Indexer_Product extends Mage_Index_Mo */ protected $_storesInfo; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('catalog/category_product_index', 'category_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php index 116eef29e9e..f0939a903a1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.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 tree 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_Tree extends Varien_Data_Tree_Dbp { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Config.php index cf9e5435539..0fd7f1e7b90 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Config.php @@ -41,10 +41,6 @@ class Mage_Catalog_Model_Resource_Config extends Mage_Core_Model_Resource_Db_Abs */ protected $_storeId = null; - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('eav/attribute', 'attribute_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php index cb0a9667c0a..5f0a819270d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php @@ -78,14 +78,10 @@ class Mage_Catalog_Model_Resource_Eav_Attribute extends Mage_Eav_Model_Entity_At const ENTITY = 'catalog_eav_attribute'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_entity_attribute'; /** - * Event object name - * * @var string */ protected $_eventObject = 'attribute'; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php index f9ee91a37ff..d2cdf7ecaa0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.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 tree 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_Tree extends Mage_Catalog_Model_Resource_Category_Tree diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php index 520543a0365..c2545103577 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.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 tier price backend attribute 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_Attribute_Backend_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php index 98a5253ca58..8806d2db832 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.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 url key 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_Urlkey extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php index a271e4532ba..df318b308d2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.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 attribute tier price frontend 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_Attribute_Frontend_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php index 977758e5a82..459203317fe 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.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 Select and Multiply Select 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_Source extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php index 38608c65ec1..7bd361e3a67 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.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 custom option 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_Option_Value extends Mage_Catalog_Model_Resource_Product_Option_Value diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php index b7cf4665789..7cb997792b1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.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 website 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_Status extends Mage_Catalog_Model_Resource_Product_Status diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php index fb719920a4a..b26f3f25011 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.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 Website 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_Website extends Mage_Catalog_Model_Resource_Product_Website diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php index f069892aa07..611d5bd3d46 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.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 entity setup * - * @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_Setup extends Mage_Catalog_Model_Resource_Setup diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php index 57c2b1263fb..12537cd25cd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.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 url rewrite 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_Url extends Mage_Catalog_Model_Resource_Url diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php index 73d2803ecc1..50f5903be36 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Layer_Filter_Attribute extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('catalog/product_index_eav', 'entity_id'); 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 1d13e4c6290..94825d089e7 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 @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Layer_Filter_Decimal extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('catalog/product_index_eav_decimal', 'entity_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php index 61f0dac3f1b..977e28b52b3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php @@ -32,10 +32,6 @@ class Mage_Catalog_Model_Resource_Layer_Filter_Price extends Mage_Core_Model_Res */ const MIN_POSSIBLE_PRICE = .01; - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('catalog/product_index_price', 'entity_id'); 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 5e82af82e25..c3119efd35e 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 @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('catalog/product_attribute_group_price', 'value_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php index 39c1da9afa1..4413d63bb84 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.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 product tier 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_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('catalog/product_attribute_tier_price', 'value_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php index af7ddd42718..513d60ed01b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.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 url key attribute backend * - * @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_Urlkey extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php index 79f70d7a6a2..57c6ab0fc57 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.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 attribute tier price frontend 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_Frontend_Tierprice extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php index 3cd2d4f117c..69f2e3537c3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Compare_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('catalog/compare_item', 'catalog_compare_item_id'); 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 22cff515c63..f2cbaec39f0 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 @@ -93,10 +93,6 @@ class Mage_Catalog_Model_Resource_Product_Flat_Indexer extends Mage_Index_Model_ */ protected $_preparedFlatTables = []; - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('catalog/product', 'entity_id'); 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 c97bb82fec7..60126de6d38 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 @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract { - /** - * Initialize connection and define main index table - * - */ protected function _construct() { $this->_init('catalog/product_index_eav_decimal', 'entity_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index 6e6d965a9a8..d2851ac8a77 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.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 Product Eav Select and Multiply Select 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_Source extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract { - /** - * Initialize connection and define main index table - * - */ protected function _construct() { $this->_init('catalog/product_index_eav', 'entity_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php index 7879745a822..6845d806258 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php @@ -34,9 +34,6 @@ class Mage_Catalog_Model_Resource_Product_Link extends Mage_Core_Model_Resource_ */ protected $_attributesTable; - /** - * Define main table name and attributes table - */ protected function _construct() { $this->_init('catalog/product_link', 'link_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php index da25bf1dfa8..185f292d5a6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Option extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('catalog/product_option', 'option_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php index 9fde7721ae9..5df613eb3cd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.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 product custom option 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_Option_Value extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('catalog/product_option_type_value', 'option_type_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php index d1d8123c2c2..b773cebe9d5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.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 website 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_Status extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,10 +34,6 @@ class Mage_Catalog_Model_Resource_Product_Status extends Mage_Core_Model_Resourc */ protected $_productAttributes = []; - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('catalog/product_enabled_index', 'product_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php index a4d1a2f5752..fa709d08f73 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php @@ -51,10 +51,6 @@ class Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection */ protected $_product; - /** - * Initialize connection and define table names - * - */ protected function _construct() { $this->_init('catalog/product_type_configurable_attribute'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php index 6d32ce2d3f8..e7005ffd4e4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.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 Product Website 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_Website extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource table - * - */ protected function _construct() { $this->_init('catalog/product_website', 'product_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Setup.php index 888fc5862b5..0052ee33dd7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Setup.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 entity setup * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Url.php index 2462b075a8b..41d229f053b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.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 url rewrite 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_Url extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php index 70b9766062d..7ceba624c11 100644 --- a/app/code/core/Mage/Catalog/Model/Session.php +++ b/app/code/core/Mage/Catalog/Model/Session.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 setBeforeCompareUrl(string $value) * @method array getFormData() diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php index 8f92a27040f..90e6f45ddb3 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.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) */ /** * Url rewrite suffix backend + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_System_Config_Backend_Catalog_Url_Rewrite_Suffix extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index e32a674e2f0..cbe587b895b 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.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/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php index e30cf66cb9c..2b5bf04f79f 100644 --- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.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,10 +23,10 @@ * * @category Mage * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Seo_SitemapController extends Mage_Core_Controller_Front_Action { - /** * Check if SEO sitemap is enabled in configuration * diff --git a/app/code/core/Mage/Catalog/etc/adminhtml.xml b/app/code/core/Mage/Catalog/etc/adminhtml.xml index 32d1d772349..c01e2b9146b 100644 --- a/app/code/core/Mage/Catalog/etc/adminhtml.xml +++ b/app/code/core/Mage/Catalog/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml index f7643e7b545..47d26fffd22 100644 --- a/app/code/core/Mage/Catalog/etc/api.xml +++ b/app/code/core/Mage/Catalog/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/api2.xml b/app/code/core/Mage/Catalog/etc/api2.xml index f877c8e554d..93a93b9f7ca 100644 --- a/app/code/core/Mage/Catalog/etc/api2.xml +++ b/app/code/core/Mage/Catalog/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml index 2dbe6c8d9de..b3bcf6e4c8c 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/convert.xml b/app/code/core/Mage/Catalog/etc/convert.xml index f9b54d02bb8..60e65a6c3df 100644 --- a/app/code/core/Mage/Catalog/etc/convert.xml +++ b/app/code/core/Mage/Catalog/etc/convert.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index ca108dfc8d0..26ea103549b 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/widget.xml b/app/code/core/Mage/Catalog/etc/widget.xml index f11145db7e7..995b64eaf1f 100644 --- a/app/code/core/Mage/Catalog/etc/widget.xml +++ b/app/code/core/Mage/Catalog/etc/widget.xml @@ -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_Catalog - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php index ec9db851ab5..603b03b5d18 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.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_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; $productTypes = [ Mage_Catalog_Model_Product_Type::TYPE_SIMPLE, diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index 940f48e6b64..4858be611be 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -12,14 +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_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; + $installer->addAttribute(Mage_Catalog_Model_Product::ENTITY, 'country_of_manufacture', [ 'group' => 'General', 'type' => 'varchar', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php index f3cd2afc512..a7c2dc1ee3d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.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/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php index e4a6d8394b9..88c7b0ee980 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php @@ -12,14 +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_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; + $indexFields = ['website_id', 'customer_group_id', 'min_price']; $installer->getConnection()->addIndex( $installer->getTable('catalog/product_index_price'), diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php index ae9e2d7e026..f08f44d42b0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.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_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; foreach (['news_from_date', 'custom_design_from'] as $attributeCode) { $installer->updateAttribute( diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php index 32e2cb97080..bc66a9608f9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.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/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php index 41cef1fc679..163fd32484c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php @@ -12,14 +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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, 'special_from_date', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php index b5690fdf1e8..a0e1ab67feb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php @@ -12,14 +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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, 'special_price', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php index 86e6a80a37b..f735c7cb381 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.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_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; $attribute = 'special_price'; $installer diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php index 91099028b17..2ddc9a5b041 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.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_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php index 490274773bd..dd0fe8732fa 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.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_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; -$attributeId = 'custom_layout_update'; +$attributeId = 'custom_layout_update'; $entitiesToUpgrade = [ $installer->getEntityTypeId('catalog_product'), $installer->getEntityTypeId('catalog_category'), diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php index 08a53d08f24..4af4ac3954b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php @@ -12,14 +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_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; + $tableName = $installer->getTable('catalog/product_index_eav_decimal'); $indexName = $installer->getConnection()->getPrimaryKeyName($tableName); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php index a238923a581..90d1dad9578 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php index 56315bc064c..6669ae2b608 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -12,14 +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_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->getConnection()->modifyColumn( $installer->getTable('catalog/category_product_index'), 'position', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php index 610fad3ddfc..12cc2332a85 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php index c670724fca2..60c2177af8a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.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/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php index 01d2b8b3f0a..e1bc95427e7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.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/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php index ce83d239621..7bdf4641693 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.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/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php index b1fdcd95016..bf97d81a134 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.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) */ /** * Date retriever abstract model * - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Data_Simple extends Mage_CatalogIndex_Model_Data_Abstract { @@ -29,7 +31,6 @@ class Mage_CatalogIndex_Model_Data_Simple extends Mage_CatalogIndex_Model_Data_A /** * Retrieve product type code - * * @return string */ public function getTypeCode() diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php index 37208da96aa..fa38982a4a4 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.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) */ /** * Virtual product data retriever * - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Data_Virtual extends Mage_CatalogIndex_Model_Data_Simple { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php index 275189f2e06..09dbdee180b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.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) */ /** * Tier Price indexer * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @property Mage_Directory_Model_Currency $_currencyModel * @property Mage_Customer_Model_Resource_Group_Collection $_customerGroups * @@ -44,10 +48,6 @@ * @method $this setMaxPrice(float $value) * @method float getTierPrice() * @method $this setTierPrice(float $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Indexer_Tierprice extends Mage_CatalogIndex_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php index 8e8e7ef7221..dbca88069be 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.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_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 + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Setup extends Mage_CatalogIndex_Model_Resource_Setup diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php index 504a1b3fd58..e3473fd114c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.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_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 + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml index db9755e53ba..28ed5f16f29 100644 --- a/app/code/core/Mage/CatalogIndex/etc/config.xml +++ b/app/code/core/Mage/CatalogIndex/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php index 29b61ef4dd5..3f8e8e60507 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Data.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php index 9304338aae8..4f322b2c7e7 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.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) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php index 68b89b4b7c0..debe1933aa1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.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_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 Stock Status Indexer Model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Indexer_Stock _getResource() * @method Mage_CatalogInventory_Model_Resource_Indexer_Stock getResource() * @method int getProductId() @@ -33,10 +37,6 @@ * @method $this setQty(float $value) * @method int getStockStatus() * @method $this setStockStatus(int $value) - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Indexer_Stock extends Mage_Index_Model_Indexer_Abstract { @@ -81,10 +81,6 @@ class Mage_CatalogInventory_Model_Indexer_Stock extends Mage_Index_Model_Indexer Mage_CatalogInventory_Helper_Data::XML_PATH_SHOW_OUT_OF_STOCK ]; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cataloginventory/indexer_stock'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php index c8acc156791..586bf1736d6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.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 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 extends Mage_CatalogInventory_Model_Resource_Indexer_Stock diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php index af17464e30f..f60020d8c65 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.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) */ /** * Stock 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_Stock extends Mage_CatalogInventory_Model_Resource_Stock diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php index 0195c461f76..78ace38c9cc 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.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 Stock Status per website 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_Stock_Status extends Mage_CatalogInventory_Model_Resource_Stock_Status diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php index 0152c0b1e12..f9111c441fa 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.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 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 extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract { @@ -42,10 +42,6 @@ class Mage_CatalogInventory_Model_Resource_Indexer_Stock extends Mage_Catalog_Mo */ protected $_defaultIndexer = 'cataloginventory/indexer_stock_default'; - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('cataloginventory/stock_status', 'product_id'); 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 a984b99a667..44dfae870a3 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 @@ -41,10 +41,6 @@ class Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default extends Mage_Ca */ protected $_isComposite = false; - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('cataloginventory/stock_status', 'product_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php index 8f8c6a07542..c65233c5aac 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.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) */ /** * Stock 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_Stock extends Mage_Core_Model_Resource_Db_Abstract { @@ -76,10 +76,6 @@ class Mage_CatalogInventory_Model_Resource_Stock extends Mage_Core_Model_Resourc */ protected $_stock; - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('cataloginventory/stock', 'stock_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php index 6084c10ce55..ba253ac1132 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php @@ -27,10 +27,6 @@ */ class Mage_CatalogInventory_Model_Resource_Stock_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('cataloginventory/stock_item', 'item_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php index bf87c7b9a89..91ec1b24360 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.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_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 Stock Status per website 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_Stock_Status extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource model initialization - * - */ protected function _construct() { $this->_init('cataloginventory/stock_status', 'product_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php index 13924beba63..2ad26aed95f 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.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) */ /** @@ -28,8 +28,6 @@ class Mage_CatalogInventory_Model_Source_Stock { /** - * Retrieve option array - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php index 562c83fa8d6..1e176265666 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock.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_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) */ /** * Stock model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Stock _getResource() * @method Mage_CatalogInventory_Model_Resource_Stock getResource() * @method string getStockName() * @method Mage_CatalogInventory_Model_Stock setStockName(string $value) - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php index adbdf36f10b..136229eb07e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.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_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) */ /** * Catalog inventory api V2 * + * @category Mage + * @package Mage_CatalogInventory * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock_Item_Api_V2 extends Mage_CatalogInventory_Model_Stock_Item_Api diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index 53802c6a2aa..5a14e960396 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.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_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 Stock Status per website Model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Stock_Status _getResource() * @method Mage_CatalogInventory_Model_Resource_Stock_Status getResource() * @method int getProductId() @@ -33,10 +37,6 @@ * @method Mage_CatalogInventory_Model_Stock_Status setQty(float $value) * @method int getStockStatus() * @method Mage_CatalogInventory_Model_Stock_Status setStockStatus(int $value) - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock_Status extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml index 40e2b834fed..70350767de6 100644 --- a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml index 4bb2e5429f6..3c958c725c1 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/api2.xml b/app/code/core/Mage/CatalogInventory/etc/api2.xml index 59371b0a24e..8c0d6566f0f 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api2.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml index ec8c7c5decc..e079ad5e4c7 100644 --- a/app/code/core/Mage/CatalogInventory/etc/config.xml +++ b/app/code/core/Mage/CatalogInventory/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml index 17e27ac84df..e4ec5f83bfe 100644 --- a/app/code/core/Mage/CatalogInventory/etc/system.xml +++ b/app/code/core/Mage/CatalogInventory/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index e7af10103cb..b58ffed228b 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.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) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php index 7e2bfb9f785..90d4bd741bc 100644 --- a/app/code/core/Mage/CatalogRule/Helper/Data.php +++ b/app/code/core/Mage/CatalogRule/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml index 6ab2aadbb63..6702576f493 100644 --- a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml index 5c4b507a78f..e1f0f077d34 100644 --- a/app/code/core/Mage/CatalogRule/etc/config.xml +++ b/app/code/core/Mage/CatalogRule/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php index 02f44f5e0f4..8138da70ca8 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/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_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 */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php index 31e114a70d8..f0dfc2dec4f 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.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_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 */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php index 1df011b56c8..ee7b7ac8f6d 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.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_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(); $ruleProductTable = $installer->getTable('catalogrule/rule_product'); diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php index ad24531c494..30faf7b723c 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Term.php +++ b/app/code/core/Mage/CatalogSearch/Block/Term.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) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php index 915c3501456..3f4c14fa240 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php index dda7d8d465b..8f05706ec6d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Query.php @@ -53,16 +53,9 @@ */ class Mage_CatalogSearch_Model_Query extends Mage_Core_Model_Abstract { - /** - * Event prefix - * - * @var string - */ protected $_eventPrefix = 'catalogsearch_query'; /** - * Event object key name - * * @var string */ protected $_eventObject = 'catalogsearch_query'; diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php index 1204195be6b..072b177d245 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php @@ -27,10 +27,6 @@ */ class Mage_CatalogSearch_Model_Resource_Advanced extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define catalog product table as main table - * - */ protected function _construct() { $this->_init('catalog/product', 'entity_id'); 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 0a17a47aff4..3a5c7d21b2c 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php @@ -27,9 +27,6 @@ */ class Mage_CatalogSearch_Model_Resource_Indexer_Fulltext extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define catalog product table as main table - */ protected function _construct() { $this->_init('catalogsearch/fulltext', 'product_id'); diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php index 508b74b49fb..27c1ecb7f51 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Session.php +++ b/app/code/core/Mage/CatalogSearch/Model/Session.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_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) */ +/** + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team + */ class Mage_CatalogSearch_Model_Session extends Mage_Core_Model_Session_Abstract { public function __construct() diff --git a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php index fcb4b10966e..6a4bdbde8dc 100644 --- a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.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_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) */ /** * Cache cleaner backend model * + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_System_Config_Backend_Sitemap extends Mage_Adminhtml_Model_System_Config_Backend_Cache { diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php index 7a1e174e155..353c794a1c6 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.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) */ +/** + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team + */ class Mage_CatalogSearch_TermController extends Mage_Core_Controller_Front_Action { - /** * @return $this|Mage_Core_Controller_Front_Action */ diff --git a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml index 0364e1c6c26..7b50fc6a121 100644 --- a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml index 0014c33e727..a243b1695fa 100644 --- a/app/code/core/Mage/CatalogSearch/etc/config.xml +++ b/app/code/core/Mage/CatalogSearch/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml index f415aac3ebc..203f0acff70 100644 --- a/app/code/core/Mage/CatalogSearch/etc/system.xml +++ b/app/code/core/Mage/CatalogSearch/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php index f064cfeccdc..d7150ca2b80 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.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_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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php index 4052d42eb98..f733d8f92d6 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php @@ -12,20 +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_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) */ /** * Adminhtml sales order create validation card block + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Block_Adminhtml_Validation extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { - /** - * construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Centinel/Block/Authentication/Start.php b/app/code/core/Mage/Centinel/Block/Authentication/Start.php index 4d9172beb6a..a2a0f9b5acd 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication/Start.php +++ b/app/code/core/Mage/Centinel/Block/Authentication/Start.php @@ -12,20 +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_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) */ /** * Authentication start/redirect form + * + * @category Mage + * @package Mage_Centinal + * @author Magento Core Team */ class Mage_Centinel_Block_Authentication_Start extends Mage_Core_Block_Template { /** * Prepare form parameters and render - * * @return string */ protected function _toHtml() diff --git a/app/code/core/Mage/Centinel/Helper/Data.php b/app/code/core/Mage/Centinel/Helper/Data.php index ffdf6bb7e6d..db6d7610e04 100644 --- a/app/code/core/Mage/Centinel/Helper/Data.php +++ b/app/code/core/Mage/Centinel/Helper/Data.php @@ -21,9 +21,9 @@ /** * Centinel module base helper * - * @category Mage - * @package Mage_Centinel - * @author Magento Core Team + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Centinel/Model/Session.php b/app/code/core/Mage/Centinel/Model/Session.php index 51d5861341e..525ac238514 100644 --- a/app/code/core/Mage/Centinel/Model/Session.php +++ b/app/code/core/Mage/Centinel/Model/Session.php @@ -12,23 +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_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) */ /** * * Payment centinel session model * - * @author Magento Core Team + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_Session extends Mage_Core_Model_Session_Abstract { - /** - * constructor - */ public function __construct() { $this->init('centinel_validator'); diff --git a/app/code/core/Mage/Centinel/Model/State/Visa.php b/app/code/core/Mage/Centinel/Model/State/Visa.php index 71f1a5dfa41..cec6c9b19af 100644 --- a/app/code/core/Mage/Centinel/Model/State/Visa.php +++ b/app/code/core/Mage/Centinel/Model/State/Visa.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_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) */ /** * Abstract Validation State Model for Visa + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_State_Visa extends Mage_Centinel_Model_StateAbstract { diff --git a/app/code/core/Mage/Centinel/Model/StateAbstract.php b/app/code/core/Mage/Centinel/Model/StateAbstract.php index 444b52a98a7..1b3bcb54a30 100644 --- a/app/code/core/Mage/Centinel/Model/StateAbstract.php +++ b/app/code/core/Mage/Centinel/Model/StateAbstract.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_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) */ /** * Abstract Validation State Model + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ abstract class Mage_Centinel_Model_StateAbstract extends Varien_Object { diff --git a/app/code/core/Mage/Centinel/etc/config.xml b/app/code/core/Mage/Centinel/etc/config.xml index 6b482e160bf..37b820a51cf 100644 --- a/app/code/core/Mage/Centinel/etc/config.xml +++ b/app/code/core/Mage/Centinel/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Centinel/etc/system.xml b/app/code/core/Mage/Centinel/etc/system.xml index ed6d38cc9b7..14a7b575642 100644 --- a/app/code/core/Mage/Centinel/etc/system.xml +++ b/app/code/core/Mage/Centinel/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php index e68dd31ff2b..30fd8b863de 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.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_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) */ /** - * Class Mage_Checkout_Block_Cart_Shipping + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Cart_Shipping extends Mage_Checkout_Block_Cart_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php index 0f2cbe0f9ab..b94d2f31e64 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.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) */ /** * Wishlist sidebar block * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Cart_Sidebar extends Mage_Checkout_Block_Cart_Minicart { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php index 280c36c0548..053043ae093 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.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_Cart_Totals extends Mage_Checkout_Block_Cart_Abstract { protected $_totalRenderers; diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php index f24dd0b83c3..2990c6eb365 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.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) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/State.php b/app/code/core/Mage/Checkout/Block/Multishipping/State.php index 2c2fa5247a8..3d34039308d 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.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_State extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php index 3ceb9e6ad94..d11dae28806 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.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_Success extends Mage_Checkout_Block_Multishipping_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php index 9414566e9c2..f5927f8045f 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.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) */ /** * One page checkout status * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Shipping extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php index b38aca6b78e..6e148fbcffe 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.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) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Success.php b/app/code/core/Mage/Checkout/Block/Success.php index 2cc0a44a11b..f8dba9f385a 100644 --- a/app/code/core/Mage/Checkout/Block/Success.php +++ b/app/code/core/Mage/Checkout/Block/Success.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_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) */ /** * Class Mage_Checkout_Block_Success * + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team + * * @method int getLastOrderId() */ class Mage_Checkout_Block_Success extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php index 18874c00298..5f797eedb93 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Tax.php +++ b/app/code/core/Mage/Checkout/Block/Total/Tax.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) */ /** * Tax Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Total_Tax extends Mage_Checkout_Block_Total_Default { diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php index b5bbf4aad1a..42128c87643 100644 --- a/app/code/core/Mage/Checkout/Helper/Data.php +++ b/app/code/core/Mage/Checkout/Helper/Data.php @@ -21,9 +21,9 @@ /** * Checkout default helper * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php index 24edc01e3bc..b19c7dfd0fd 100644 --- a/app/code/core/Mage/Checkout/Helper/Url.php +++ b/app/code/core/Mage/Checkout/Helper/Url.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) */ /** * Checkout url helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Helper_Url extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php index ab6a43603e9..8f55b29261c 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.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 model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Cart_Api_V2 extends Mage_Checkout_Model_Cart_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php index 767c2f0bb14..4c6c0cd97ff 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.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_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 api * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Coupon_Api_V2 extends Mage_Checkout_Model_Cart_Coupon_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php index dd123fc57f4..dbf6f1e05b8 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.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) */ /** * Shoping cart api for customer data * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Cart_Customer_Api_V2 extends Mage_Checkout_Model_Cart_Customer_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php index e79a18c65b5..af217786fd1 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.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_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 api * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Payment_Api_V2 extends Mage_Checkout_Model_Cart_Payment_Api { /** diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php index a66851f1d26..3b54dd77587 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.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_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 api for product * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Product_Api_V2 extends Mage_Checkout_Model_Cart_Product_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php index ae779f301c3..8400e3b084c 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.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_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 api * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Shipping_Api_V2 extends Mage_Checkout_Model_Cart_Shipping_Api { diff --git a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php index 636dfcb7198..f6bd827d76e 100644 --- a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php +++ b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.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_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_Model_Config_Source_Cart_Summary { diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php index a01cc924d07..e4604b48581 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.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) */ /** * Checkout Resource Setup Model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * @deprecated */ class Mage_Checkout_Model_Mysql4_Setup extends Mage_Checkout_Model_Resource_Setup diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php index f3be77c43ac..310c5d70a93 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php @@ -27,10 +27,6 @@ */ class Mage_Checkout_Model_Resource_Agreement extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('checkout/agreement', 'agreement_id'); diff --git a/app/code/core/Mage/Checkout/Model/Resource/Cart.php b/app/code/core/Mage/Checkout/Model/Resource/Cart.php index 948091e0cb8..d3dea12c902 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Cart.php @@ -27,10 +27,6 @@ */ class Mage_Checkout_Model_Resource_Cart extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/quote', 'entity_id'); diff --git a/app/code/core/Mage/Checkout/Model/Resource/Setup.php b/app/code/core/Mage/Checkout/Model/Resource/Setup.php index e1bed491cf2..8054bfe0396 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Setup.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) */ /** * Checkout Resource Setup Model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php index 7089dfe36c3..1c4bb746b48 100644 --- a/app/code/core/Mage/Checkout/Model/Session.php +++ b/app/code/core/Mage/Checkout/Model/Session.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_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) */ /** - * Class Mage_Checkout_Model_Session + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method $this setAdditionalMessages(array $value) * diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php index 8381260eb32..9cd541ea393 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php @@ -39,9 +39,6 @@ class Mage_Checkout_Model_Type_Multishipping extends Mage_Checkout_Model_Type_Ab */ protected $_quoteShippingAddressesItems; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php index f41625a0325..2028b79e0c6 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.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_Model_Type_Multishipping_State extends Varien_Object { diff --git a/app/code/core/Mage/Checkout/etc/adminhtml.xml b/app/code/core/Mage/Checkout/etc/adminhtml.xml index e8b0cf5ef14..2d054df2f2f 100644 --- a/app/code/core/Mage/Checkout/etc/adminhtml.xml +++ b/app/code/core/Mage/Checkout/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/api.xml b/app/code/core/Mage/Checkout/etc/api.xml index 8720fe13034..146cfc799cc 100644 --- a/app/code/core/Mage/Checkout/etc/api.xml +++ b/app/code/core/Mage/Checkout/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml index 29b1e2f96ca..ea945fdba43 100644 --- a/app/code/core/Mage/Checkout/etc/config.xml +++ b/app/code/core/Mage/Checkout/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/jstranslator.xml b/app/code/core/Mage/Checkout/etc/jstranslator.xml index b6aa3060cc4..11a1ce313df 100644 --- a/app/code/core/Mage/Checkout/etc/jstranslator.xml +++ b/app/code/core/Mage/Checkout/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml index 2adaa43333e..77aa48bbabf 100644 --- a/app/code/core/Mage/Checkout/etc/system.xml +++ b/app/code/core/Mage/Checkout/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php index 3b110ee8ea0..cd71dfd54fe 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.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) */ /** * Wysiwyg Images model * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Model_Wysiwyg_Images_Storage extends Varien_Object { diff --git a/app/code/core/Mage/Cms/etc/adminhtml.xml b/app/code/core/Mage/Cms/etc/adminhtml.xml index 7809b041a67..36c9e762b5c 100644 --- a/app/code/core/Mage/Cms/etc/adminhtml.xml +++ b/app/code/core/Mage/Cms/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml index 77b89e9c58a..b35d57a4a4c 100644 --- a/app/code/core/Mage/Cms/etc/config.xml +++ b/app/code/core/Mage/Cms/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml index 49477500519..2a89fd6ac1a 100644 --- a/app/code/core/Mage/Cms/etc/system.xml +++ b/app/code/core/Mage/Cms/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/widget.xml b/app/code/core/Mage/Cms/etc/widget.xml index 379fabeb9cc..b1e5a787590 100644 --- a/app/code/core/Mage/Cms/etc/widget.xml +++ b/app/code/core/Mage/Cms/etc/widget.xml @@ -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_Cms - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php index 67839c159fe..2b132ceafee 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.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_ConfigurableSwatches + * @category Mage + * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_ConfigurableSwatches_Block_Catalog_Layer_State_Swatch * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team + * * @method $this setJsonConfig(string $value) * @method int getSwatchInnerHeight() * @method $this setSwatchInnerHeight(int $value) diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php index 2121c73ba7c..5a6570135bd 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php @@ -13,15 +13,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_ConfigurableSwatches + * @category Mage + * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_ConfigurableSwatches_Block_Catalog_Product_View_Type_Configurable_Swatches * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team + * * @method $this setJsonConfig(string $value) * @method $this setSwatchInnerHeight(int $value) * @method $this setSwatchInnerWidth(int $value) diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php index 0fb0cf24965..0fe682acc19 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_ConfigurableSwatches - * @author Magento Core Team + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php index c2dc0f02fc0..2f4666a9513 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.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_ConfigurableSwatches + * @category Mage + * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_ConfigurableSwatches_Helper_Swatchdimensions + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Swatchdimensions extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml b/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml index 529945c2360..5abcbc4fb7e 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/config.xml b/app/code/core/Mage/ConfigurableSwatches/etc/config.xml index 20e95b84c37..4dba0e93549 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/config.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml b/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml index 22d23f0689b..fbc692847a0 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml index 7f42e65f3e7..a8d0b751dc7 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ConfigurableSwatches - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/adminhtml.xml b/app/code/core/Mage/Contacts/etc/adminhtml.xml index 04d7b6011e0..c5a0f45c82c 100644 --- a/app/code/core/Mage/Contacts/etc/adminhtml.xml +++ b/app/code/core/Mage/Contacts/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml index 17672c7bee1..c8f6dd7a14e 100644 --- a/app/code/core/Mage/Contacts/etc/config.xml +++ b/app/code/core/Mage/Contacts/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index 439c5a03a55..09d96d101c8 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php index c178dbfb736..690a4793a7a 100644 --- a/app/code/core/Mage/Core/Block/Store/Switcher.php +++ b/app/code/core/Mage/Core/Block/Store/Switcher.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 array getLanguages() * @method $this setLanguages(array $value) diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php index 2f1bb12ef1a..32a42ef149f 100644 --- a/app/code/core/Mage/Core/Block/Template.php +++ b/app/code/core/Mage/Core/Block/Template.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/Template/Smarty.php b/app/code/core/Mage/Core/Block/Template/Smarty.php index 671bb38e597..20c35faaf8d 100644 --- a/app/code/core/Mage/Core/Block/Template/Smarty.php +++ b/app/code/core/Mage/Core/Block/Template/Smarty.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 + */ class Mage_Core_Block_Template_Smarty extends Mage_Core_Block_Template { - } diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php index e74f88b0d25..25d3e154a8e 100644 --- a/app/code/core/Mage/Core/Block/Template/Zend.php +++ b/app/code/core/Mage/Core/Block/Template/Zend.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_Block_Template_Zend extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Core/Block/Text.php b/app/code/core/Mage/Core/Block/Text.php index 218cf8695ae..d0933863b9a 100644 --- a/app/code/core/Mage/Core/Block/Text.php +++ b/app/code/core/Mage/Core/Block/Text.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 * * @method array getLiParams() * @method $this setLiParams(array $value) diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php index ac9a0168ac7..e260a575abd 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag.php +++ b/app/code/core/Mage/Core/Block/Text/Tag.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 * * @method string getTagContents() * @method $this setTagContents(string $value) @@ -31,7 +33,6 @@ */ class Mage_Core_Block_Text_Tag extends Mage_Core_Block_Text { - protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index 252abc2133b..3bda4003bc0 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -122,8 +122,6 @@ abstract class Mage_Core_Controller_Varien_Action protected $_removeDefaultTitle = false; /** - * Constructor - * * @param Zend_Controller_Request_Abstract $request * @param Zend_Controller_Response_Abstract $response * @param array $invokeArgs diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php index 7b4f59a26e3..eb03def399e 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.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_Standard extends Mage_Core_Controller_Varien_Router_Abstract { protected $_modules = []; diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index 27fb3ab2b7f..c7455c6a1e3 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -21,9 +21,9 @@ /** * Core data helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/File/Storage.php b/app/code/core/Mage/Core/Helper/File/Storage.php index 78f9f6f0a2b..3241701f726 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage.php +++ b/app/code/core/Mage/Core/Helper/File/Storage.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 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 extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php index 87a29135351..72325b628b6 100644 --- a/app/code/core/Mage/Core/Helper/String.php +++ b/app/code/core/Mage/Core/Helper/String.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) */ /** * Core data helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_String extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/Translate.php b/app/code/core/Mage/Core/Helper/Translate.php index 2d1d178ddce..2deb43bcf52 100644 --- a/app/code/core/Mage/Core/Helper/Translate.php +++ b/app/code/core/Mage/Core/Helper/Translate.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) */ /** * Core data helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Translate extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/UnserializeArray.php b/app/code/core/Mage/Core/Helper/UnserializeArray.php index f343706842d..b9d8c17464e 100644 --- a/app/code/core/Mage/Core/Helper/UnserializeArray.php +++ b/app/code/core/Mage/Core/Helper/UnserializeArray.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 unserialize helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_UnserializeArray { diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php index 00ab2b56a07..30b6f6a04bf 100644 --- a/app/code/core/Mage/Core/Helper/Url.php +++ b/app/code/core/Mage/Core/Helper/Url.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_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 URL helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Url extends Mage_Core_Helper_Abstract { - /** * Retrieve current url * diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index a2afc9897aa..494ad35bcf6 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -255,9 +255,6 @@ class Mage_Core_Model_App */ protected $_isInstalled = null; - /** - * Constructor - */ public function __construct() { } diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php index 527aea5acdc..1c580c03f7c 100644 --- a/app/code/core/Mage/Core/Model/App/Emulation.php +++ b/app/code/core/Mage/Core/Model/App/Emulation.php @@ -42,8 +42,6 @@ class Mage_Core_Model_App_Emulation extends Varien_Object protected $_app; /** - * Constructor - * * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php index f49f332682b..2bdd8fb3288 100644 --- a/app/code/core/Mage/Core/Model/Config/System.php +++ b/app/code/core/Mage/Core/Model/Config/System.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_Config_System extends Mage_Core_Model_Config_Base { diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php index 8650bee8913..9795398b439 100644 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ b/app/code/core/Mage/Core/Model/Design/Fallback.php @@ -52,7 +52,6 @@ class Mage_Core_Model_Design_Fallback protected $_visited; /** - * Constructor * @param array $params */ public function __construct(array $params = []) diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index 8411b1134bb..4e4b312d0bb 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.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) */ /** @@ -32,6 +32,10 @@ * ); * $emailTemplate->send('some@domain.com', 'Name Of User', $variables); * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Email_Template _getResource() * @method Mage_Core_Model_Resource_Email_Template getResource() * @method string getTemplateCode() @@ -72,10 +76,6 @@ * @method bool getUseAbsoluteLinks() * @method setUseAbsoluteLinks(bool $value) * @method $this setInlineCssFile(string $value) - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Email_Template extends Mage_Core_Model_Email_Template_Abstract { diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php index e95c9a1d9b7..a698c6abb1f 100644 --- a/app/code/core/Mage/Core/Model/Email/Transport.php +++ b/app/code/core/Mage/Core/Model/Email/Transport.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_Email_Transport extends Zend_Mail_Transport_Sendmail { diff --git a/app/code/core/Mage/Core/Model/File/Storage.php b/app/code/core/Mage/Core/Model/File/Storage.php index 49ab685124e..69d096bf752 100644 --- a/app/code/core/Mage/Core/Model/File/Storage.php +++ b/app/code/core/Mage/Core/Model/File/Storage.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 model 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 extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/File/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php index afeb0acff57..ea70dfc8764 100644 --- a/app/code/core/Mage/Core/Model/File/Uploader.php +++ b/app/code/core/Mage/Core/Model/File/Uploader.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/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php index dc6651d715a..4838364fc2c 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php @@ -74,9 +74,6 @@ class Mage_Core_Model_File_Validator_AvailablePath extends Zend_Validate_Abstrac */ protected $_pathsData; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php index 482c4a28538..42b76d11c27 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php +++ b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php @@ -43,9 +43,6 @@ class Mage_Core_Model_File_Validator_NotProtectedExtension extends Zend_Validate */ protected $_protectedFileExtensions = []; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php b/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php index 945998f569c..0bf283dbd09 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php +++ b/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.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/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index a8c3b9551ec..2914f36093f 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.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_Update { /** diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php index 5a19d23efdb..ee7f4725966 100644 --- a/app/code/core/Mage/Core/Model/Layout/Validator.php +++ b/app/code/core/Mage/Core/Model/Layout/Validator.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) */ /** @@ -77,9 +77,6 @@ class Mage_Core_Model_Layout_Validator extends Zend_Validate_Abstract self::PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR => '//action/*[@helper]', ]; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Core/Model/Magento/Api/V2.php b/app/code/core/Mage/Core/Model/Magento/Api/V2.php index 3451f17fad1..26ae2a4495c 100644 --- a/app/code/core/Mage/Core/Model/Magento/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Magento/Api/V2.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/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php index 7ca6c9bdd1a..9d9d5e3bbf7 100644 --- a/app/code/core/Mage/Core/Model/Message/Success.php +++ b/app/code/core/Mage/Core/Model/Message/Success.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_Success extends Mage_Core_Model_Message_Abstract { /** diff --git a/app/code/core/Mage/Core/Model/Message/Warning.php b/app/code/core/Mage/Core/Model/Message/Warning.php index 20c60f4a8ef..4c1ea08aceb 100644 --- a/app/code/core/Mage/Core/Model/Message/Warning.php +++ b/app/code/core/Mage/Core/Model/Message/Warning.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_Warning extends Mage_Core_Model_Message_Abstract { /** diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php index c223b03306f..8317f23a8a3 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.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) */ /** * Template db resource * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Email_Template extends Mage_Core_Model_Resource_Email_Template diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php index d47037389bc..987f4b82718 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Session.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) */ /** * Mysql4 session save handler * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Session extends Mage_Core_Model_Resource_Session diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php index 5ab9f554038..d898718c70a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store.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_Store extends Mage_Core_Model_Resource_Store diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php index 6d53b9914f1..035ab2f0502 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.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) */ /** * Translation 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_Translate extends Mage_Core_Model_Resource_Translate diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php index 24ae159cfc3..b6d81d12a93 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.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) */ /** * String translate 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_Translate_String extends Mage_Core_Model_Resource_Translate_String diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable.php b/app/code/core/Mage/Core/Model/Mysql4/Variable.php index 1834cd5c90b..c890eeb9f91 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable.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) */ /** * Custom variable 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_Variable extends Mage_Core_Model_Resource_Variable diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php index d7e38aa250c..17d68384d00 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website.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_Website extends Mage_Core_Model_Resource_Website diff --git a/app/code/core/Mage/Core/Model/Resource/Cache.php b/app/code/core/Mage/Core/Model/Resource/Cache.php index c934529c863..1848d7c48d3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Cache.php +++ b/app/code/core/Mage/Core/Model/Resource/Cache.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Cache extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/cache_option', 'code'); diff --git a/app/code/core/Mage/Core/Model/Resource/Config.php b/app/code/core/Mage/Core/Model/Resource/Config.php index 0dcc4adda67..a8c305614fd 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config.php +++ b/app/code/core/Mage/Core/Model/Resource/Config.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Config extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/config_data', 'config_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Config/Data.php b/app/code/core/Mage/Core/Model/Resource/Config/Data.php index cde19bd268b..b3fd13f7df4 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Resource/Config/Data.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Config_Data extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/config_data', 'config_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Design.php b/app/code/core/Mage/Core/Model/Resource/Design.php index 41c3754c745..a0520257e81 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design.php +++ b/app/code/core/Mage/Core/Model/Resource/Design.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and primary key - * - */ protected function _construct() { $this->_init('core/design_change', 'design_change_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template.php b/app/code/core/Mage/Core/Model/Resource/Email/Template.php index 3549e396519..b7b0a9b4ea3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template.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_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) */ /** * Template db resource * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Email_Template extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize email template resource model - * - */ protected function _construct() { $this->_init('core/email_template', 'template_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php index 448449065d8..4e34fb89300 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php @@ -12,21 +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_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) */ /** * Class describing db table resource entity * + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Entity_Table extends Mage_Core_Model_Resource_Entity_Abstract { /** - * Get table - * * @return String */ public function getTable() diff --git a/app/code/core/Mage/Core/Model/Resource/Flag.php b/app/code/core/Mage/Core/Model/Resource/Flag.php index d6bf99c5c79..abb115007aa 100644 --- a/app/code/core/Mage/Core/Model/Resource/Flag.php +++ b/app/code/core/Mage/Core/Model/Resource/Flag.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Flag extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/flag', 'flag_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Language.php b/app/code/core/Mage/Core/Model/Resource/Language.php index a85c8c85e63..108f769be4f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Language.php +++ b/app/code/core/Mage/Core/Model/Resource/Language.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Language extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/language', 'language_code'); diff --git a/app/code/core/Mage/Core/Model/Resource/Layout.php b/app/code/core/Mage/Core/Model/Resource/Layout.php index d2322044510..63aa1a8d835 100644 --- a/app/code/core/Mage/Core/Model/Resource/Layout.php +++ b/app/code/core/Mage/Core/Model/Resource/Layout.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Layout extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/layout_update', 'layout_update_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Resource.php b/app/code/core/Mage/Core/Model/Resource/Resource.php index d2c636be6d3..c3145f9b14c 100644 --- a/app/code/core/Mage/Core/Model/Resource/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource/Resource.php @@ -41,10 +41,6 @@ class Mage_Core_Model_Resource_Resource extends Mage_Core_Model_Resource_Db_Abst */ protected static $_dataVersions = null; - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/resource', 'store_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php index 397bd3cf5b5..61e7b65d585 100644 --- a/app/code/core/Mage/Core/Model/Resource/Session.php +++ b/app/code/core/Mage/Core/Model/Resource/Session.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) */ /** * Mysql4 session save handler * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Interface { @@ -69,10 +69,6 @@ class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Inter */ protected $_automaticCleaningFactor = 50; - /** - * Constructor - * - */ public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index b207d10a125..e7ca1e0864a 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.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) */ /** * Resource Setup Model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Core/Model/Resource/Store.php b/app/code/core/Mage/Core/Model/Resource/Store.php index 769192be190..6309ff32d61 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store.php +++ b/app/code/core/Mage/Core/Model/Resource/Store.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_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 Store 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 extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and primary key - * - */ protected function _construct() { $this->_init('core/store', 'store_id'); 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 6b4c7fe4fe7..d79efb550cb 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Store_Group extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/store_group', 'group_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php index 01fad7fed86..4dd657f68c8 100644 --- a/app/code/core/Mage/Core/Model/Resource/Transaction.php +++ b/app/code/core/Mage/Core/Model/Resource/Transaction.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_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) */ /** * Resource transaction model * - * @todo need collect conection by name * @category Mage * @package Mage_Core * @author Magento Core Team + * @todo need collect conection by name */ class Mage_Core_Model_Resource_Transaction { diff --git a/app/code/core/Mage/Core/Model/Resource/Translate.php b/app/code/core/Mage/Core/Model/Resource/Translate.php index d4da60fbe03..75607fcd12b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate.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_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) */ /** * Translation 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_Translate extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/translate', 'key_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Translate/String.php b/app/code/core/Mage/Core/Model/Resource/Translate/String.php index b0663c8d603..f5802bfc066 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate/String.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_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) */ /** * String translate 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_Translate_String extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/translate', 'key_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php index 365b61fffcc..2fc25a65409 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.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_Resource_Type_Db_Mysqli_Setup extends Mage_Core_Model_Resource_Type_Db { /** diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php index b6eb5a87f4b..c4be58bd92b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php @@ -34,10 +34,6 @@ class Mage_Core_Model_Resource_Url_Rewrite extends Mage_Core_Model_Resource_Db_A */ protected $_tagTable; - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/url_rewrite', 'url_rewrite_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Variable.php b/app/code/core/Mage/Core/Model/Resource/Variable.php index 9d991236d55..088fad12d42 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable.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_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 variable 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_Variable extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor - * - */ protected function _construct() { $this->_init('core/variable', 'variable_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Website.php b/app/code/core/Mage/Core/Model/Resource/Website.php index 7bc186442d7..50ab26d40ec 100644 --- a/app/code/core/Mage/Core/Model/Resource/Website.php +++ b/app/code/core/Mage/Core/Model/Resource/Website.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_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 Website 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_Website extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/website', 'website_id'); diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php index aeec2e7a425..67f15279585 100644 --- a/app/code/core/Mage/Core/Model/Session.php +++ b/app/code/core/Mage/Core/Model/Session.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) */ /** * Core session model * - * @todo extend from Mage_Core_Model_Session_Abstract + * @category Mage + * @package Mage_Core + * @author Magento Core Team * * @method null|bool getCookieShouldBeReceived() * @method $this setCookieShouldBeReceived(bool $value) diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index 246a9e33c56..68ca00e8dc3 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -12,15 +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_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 bool|null getSkipEmptySessionCheck() * @method $this setSkipEmptySessionCheck(bool $flag) */ - class Mage_Core_Model_Session_Abstract_Varien extends Varien_Object { const VALIDATOR_KEY = '_session_validator_data'; diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php index 96537419303..503640963ac 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.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 getCookieDomain() * @method string getCookiePath() diff --git a/app/code/core/Mage/Core/Model/Source/Email/Variables.php b/app/code/core/Mage/Core/Model/Source/Email/Variables.php index 6791473a96b..bc3908705fb 100644 --- a/app/code/core/Mage/Core/Model/Source/Email/Variables.php +++ b/app/code/core/Mage/Core/Model/Source/Email/Variables.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) */ /** @@ -34,10 +34,6 @@ class Mage_Core_Model_Source_Email_Variables */ protected $_configVariables = []; - /** - * Constructor - * - */ public function __construct() { $this->_configVariables = [ diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 5f30c3413ea..1f41c682491 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.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 model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Store _getResource() * @method Mage_Core_Model_Resource_Store getResource() * @method Mage_Core_Model_Resource_Store_Collection getCollection() @@ -43,10 +47,6 @@ * @method $this setStoreId(int $value) * @method $this setWebsiteId(int $value) * @method string getRootCategoryPath() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract { @@ -186,8 +186,6 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract protected $_eventPrefix = 'store'; /** - * Event object name - * * @var string */ protected $_eventObject = 'store'; diff --git a/app/code/core/Mage/Core/Model/Store/Api/V2.php b/app/code/core/Mage/Core/Model/Store/Api/V2.php index 5b53ceab1b7..c4db4a4c7dc 100644 --- a/app/code/core/Mage/Core/Model/Store/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Store/Api/V2.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/Template.php b/app/code/core/Mage/Core/Model/Template.php index 2511abb25d1..954ed07b4e8 100644 --- a/app/code/core/Mage/Core/Model/Template.php +++ b/app/code/core/Mage/Core/Model/Template.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) */ /** * Template model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ abstract class Mage_Core_Model_Template extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index 1d5ad2619a8..af9915f95f9 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.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 model * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Translate { diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php index e77585ddf7d..4956752f629 100644 --- a/app/code/core/Mage/Core/Model/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Translate/String.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) */ /** * String translation model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Translate_String _getResource() * @method Mage_Core_Model_Resource_Translate_String getResource() * @method int getStoreId() @@ -31,10 +35,6 @@ * @method $this setStoreTranslations(array $value) * @method string getLocale() * @method $this setLocale(string $value) - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Translate_String extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php index 9bb499db55c..91d9866aaa4 100644 --- a/app/code/core/Mage/Core/Model/Url.php +++ b/app/code/core/Mage/Core/Model/Url.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) */ /** @@ -68,7 +68,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team * * @method $this setType(string $value) * @method $this setSecure(bool $value) diff --git a/app/code/core/Mage/Core/Model/Url/Validator.php b/app/code/core/Mage/Core/Model/Url/Validator.php index 0b07e6b5e10..ace4f5058ad 100644 --- a/app/code/core/Mage/Core/Model/Url/Validator.php +++ b/app/code/core/Mage/Core/Model/Url/Validator.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/Variable.php b/app/code/core/Mage/Core/Model/Variable.php index 484fc0fd999..aaec08cb163 100644 --- a/app/code/core/Mage/Core/Model/Variable.php +++ b/app/code/core/Mage/Core/Model/Variable.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) */ /** * Custom variable model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Variable _getResource() * @method Mage_Core_Model_Resource_Variable getResource() * @method string getCode() @@ -30,10 +34,6 @@ * @method bool getUseDefaultValue() * @method string getHtmlValue() * @method string getPlainValue() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Variable extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php index b2fd1fa91b4..404afebf424 100644 --- a/app/code/core/Mage/Core/Model/Website.php +++ b/app/code/core/Mage/Core/Model/Website.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 Website model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Website _getResource() * @method Mage_Core_Model_Resource_Website getResource() * @method Mage_Core_Model_Resource_Website_Collection getCollection() @@ -41,12 +45,7 @@ * @method bool hasWebsiteId() * @method int getWebsiteId() * @method bool hasDefaultGroupId() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ - class Mage_Core_Model_Website extends Mage_Core_Model_Abstract { const ENTITY = 'core_website'; diff --git a/app/code/core/Mage/Core/etc/api.xml b/app/code/core/Mage/Core/etc/api.xml index f99607b0ed8..8021a02ed9c 100644 --- a/app/code/core/Mage/Core/etc/api.xml +++ b/app/code/core/Mage/Core/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 46f850546e6..5176685c5fb 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/jstranslator.xml b/app/code/core/Mage/Core/etc/jstranslator.xml index 5a1f46f9e39..39f04f7ec1c 100644 --- a/app/code/core/Mage/Core/etc/jstranslator.xml +++ b/app/code/core/Mage/Core/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 1f6e61f5e28..a3a4e74f25f 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php index aa7ac9671cc..0530663d20c 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.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(); $installer->getConnection()->dropForeignKey( diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php index c86685849ac..91098efd850 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $table = $installer->getTable('core/translate'); diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php index 9e070398a73..9be11e9378b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php index 1b7f863430a..bd4eb6f82bf 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.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/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php index 5d7ce3afbba..ff46b47457e 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.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_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(); -$connection = $installer->getConnection(); +$connection = $installer->getConnection(); $connection->delete( $this->getTable('core_config_data'), $connection->prepareSqlCondition('path', [ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php index 3f7807f3f5f..c2da8bcf442 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.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_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(); -$connection = $installer->getConnection(); +$connection = $installer->getConnection(); $connection->delete( $this->getTable('core_config_data'), $connection->prepareSqlCondition('path', [ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php index 760660d0191..74f1a3f765f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.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_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(); -$connection = $installer->getConnection(); +$connection = $installer->getConnection(); $connection->addColumn($installer->getTable('core_config_data'), 'updated_at', Varien_Db_Ddl_Table::TYPE_TIMESTAMP); $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php index d089a30c3a8..3ec33bd8435 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.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_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(); + $table = $installer->getTable('core/file_storage'); /** diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml index f5b3c0749ff..a43c344a8f7 100644 --- a/app/code/core/Mage/Cron/etc/config.xml +++ b/app/code/core/Mage/Cron/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Cron * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml index 64a0e47915d..fb8aff962a7 100644 --- a/app/code/core/Mage/Cron/etc/system.xml +++ b/app/code/core/Mage/Cron/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php index ad8753582bb..3e73f07a3af 100644 --- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php @@ -34,9 +34,6 @@ class Mage_CurrencySymbol_Block_Adminhtml_System_Currencysymbol extends Mage_Adm */ private $_controller; - /** - * Constructor. Initialization required variables for class instance. - */ public function __construct() { $this->_blockGroup = 'currencysymbol_system'; diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php index dc530c9b820..cdf0458edf7 100644 --- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php +++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php @@ -21,9 +21,9 @@ /** * Adminhtml Currency Symbols Controller * - * @category Mage - * @package Mage_CurrencySymbol - * @author Magento Core Team + * @category Mage + * @package Mage_CurrencySymbol + * @author Magento Core Team */ class Mage_CurrencySymbol_Adminhtml_System_CurrencysymbolController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml index a252e4f29bf..2d12af2db19 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CurrencySymbol * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CurrencySymbol/etc/config.xml b/app/code/core/Mage/CurrencySymbol/etc/config.xml index a2d2302469d..e69a2cebb2a 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/config.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CurrencySymbol * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard.php b/app/code/core/Mage/Customer/Block/Account/Dashboard.php index a28aa748e91..a481602582f 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php @@ -21,9 +21,9 @@ /** * Customer dashboard block * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team * * @method string getRefererUrl() * @method $this setRefererUrl(string $value) diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php index bd439f49f01..dce1f6936b4 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.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_Sidebar extends Mage_Core_Block_Template { protected $_cartItemsCount; diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php index 69d13588ab8..d24a963ca5b 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php +++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.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) */ /** * Class Mage_Customer_Block_Widget_Taxvat * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method $this setFieldIdFormat(string $value) * @method $this setFieldNameFormat(string $value) * @method $this setTaxvat(string $value) diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php index 930b943f879..968c94690b9 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php index 7323798bc93..8ec56cdd327 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php index 55c3734bded..bbace81c4f1 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php index 5011393b2fc..1ead6e84bc0 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php index 47c1dca7130..41a2e63a988 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php index 16df1361cac..29442e04697 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php index 706fa07229a..b92a9268beb 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.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 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_Text extends Mage_Eav_Model_Attribute_Data_Text { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php index 63f7142ffd7..ceeecc69318 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.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 Text Area 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_Textarea extends Mage_Eav_Model_Attribute_Data_Textarea { diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php index de7f56f265d..a2d19f6476a 100644 --- a/app/code/core/Mage/Customer/Model/Config/Share.php +++ b/app/code/core/Mage/Customer/Model/Config/Share.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_Config_Share extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php index cc54f540e04..75871b57184 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Convert_Adapter_Customer extends Mage_Eav_Model_Convert_Adapter_Entity { diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php index 9d87bbaf643..9c47587994e 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Convert_Parser_Customer extends Mage_Eav_Model_Convert_Parser_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index 384c3225787..72b604f63a5 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -21,9 +21,9 @@ /** * Customer model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team * * @method Mage_Customer_Model_Resource_Customer getResource() * @method Mage_Customer_Model_Resource_Customer _getResource() diff --git a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php index 228d414c08f..48f71b091b5 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php index d2b90138c23..d0e62b25fec 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.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_Backend_Shipping extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php index 591ce4118cc..54576e20bee 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.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_Backend_Store extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php index 131f5a19d84..799a2068838 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.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_Backend_Website extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php index 44447f67fd7..f55b74b5fe8 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.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_Store extends Mage_Eav_Model_Entity_Attribute_Source_Table { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php index c3fdded4da5..b56c479593b 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.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_Website extends Mage_Eav_Model_Entity_Attribute_Source_Table { diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php index fed0f38b098..b3c64665856 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.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 password attribute backend * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Entity_Address_Attribute_Backend_Street extends Mage_Customer_Model_Resource_Address_Attribute_Backend_Street { diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php index 2a87f7fd055..e8cd71292db 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php @@ -35,8 +35,6 @@ class Mage_Customer_Model_Entity_Address_Attribute_Source_Country extends Mage_C protected $_factory; /** - * Constructor for Mage_Customer_Model_Entity_Address_Attribute_Source_Country - * * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php index 83251e74e64..90431400e70 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Setup.php +++ b/app/code/core/Mage/Customer/Model/Entity/Setup.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 resource setup model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Entity_Setup extends Mage_Customer_Model_Resource_Setup { diff --git a/app/code/core/Mage/Customer/Model/Group/Api/V2.php b/app/code/core/Mage/Customer/Model/Group/Api/V2.php index 4e1d89b82f5..ca2e35b87d8 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Group/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php index 2bd361ea582..43bf5b6503b 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.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 password attribute backend * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Resource_Address_Attribute_Backend_Street extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php index c879885758b..59ddd91a242 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php @@ -27,10 +27,6 @@ */ class Mage_Customer_Model_Resource_Form_Attribute extends Mage_Eav_Model_Resource_Form_Attribute { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('customer/form_attribute', 'attribute_id'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Setup.php b/app/code/core/Mage/Customer/Model/Resource/Setup.php index b508d3c317b..88aa7a41779 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Setup.php +++ b/app/code/core/Mage/Customer/Model/Resource/Setup.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 resource setup model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php index 2fc33190c4e..de5f1d7d041 100644 --- a/app/code/core/Mage/Customer/Model/Session.php +++ b/app/code/core/Mage/Customer/Model/Session.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 session model * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method string getAddActionReferer() * @method $this setAddActionReferer(string $value) * @method array getAddressFormData() @@ -52,10 +56,6 @@ * @method bool hasWishlistItemCount() * @method int getWishlistItemCount() * @method $this setWishlistItemCount(int $value) - * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team */ class Mage_Customer_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml index 4e561ffd4f9..28cdf1e4666 100644 --- a/app/code/core/Mage/Customer/etc/adminhtml.xml +++ b/app/code/core/Mage/Customer/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml index 3240777b90b..709d25f5426 100644 --- a/app/code/core/Mage/Customer/etc/api.xml +++ b/app/code/core/Mage/Customer/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/api2.xml b/app/code/core/Mage/Customer/etc/api2.xml index d648e09e484..05702862d40 100644 --- a/app/code/core/Mage/Customer/etc/api2.xml +++ b/app/code/core/Mage/Customer/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml index 0dc85b25c84..42dd0562a78 100644 --- a/app/code/core/Mage/Customer/etc/config.xml +++ b/app/code/core/Mage/Customer/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml index 723c6563cca..8dd50915b93 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php index b5743f65446..ad874d01fd5 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.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_Entity_Setup $installer */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php index 6a9939b3470..f92f443e4f8 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.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_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/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php index 0e0745c7c72..9677c137cc8 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.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) */ /** diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.php index b687f98aa86..fa3aa386814 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.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/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.0.5.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.0.5.php index 2eb0d3f75d5..b28d8095bc6 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.0.5.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.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_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/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.0.6.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.0.6.php index a8653da74c9..effb5af1e19 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.0.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.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_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/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.php index 7aad536a43d..6b5663983ba 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.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/Dataflow/Model/Convert/Adapter/Db/Table.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php index c84d25f8bc4..9af118af92b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.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_Db_Table extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function getResource() { if (!$this->_resource) { @@ -45,5 +44,4 @@ public function save() { } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php index d135a471fff..8dbdd6e3bf9 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.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_Soap extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function load() { return $this; @@ -37,5 +36,4 @@ public function save() { return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php index 79c9fd3eb34..1d09e9a83c7 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.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_Std extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function load() { $data = ''; @@ -44,5 +43,4 @@ public function save() echo $this->getData(); return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php index 5a826341521..815924177a1 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.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 Session 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_Session extends Mage_Dataflow_Model_Resource_Session diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch.php index 9221282a425..8b56fd309ec 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Batch extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/batch', 'batch_id'); 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 52031851def..47565e5cbbf 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Batch_Export extends Mage_Dataflow_Model_Resource_Batch_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/batch_export', 'batch_export_id'); 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 f02873972df..ca3801cbc1e 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Batch_Import extends Mage_Dataflow_Model_Resource_Batch_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/batch_import', 'batch_import_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Import.php b/app/code/core/Mage/Dataflow/Model/Resource/Import.php index 53083d5e750..8cf39c7b6d0 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Import extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/import', 'import_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php index 7db3690b082..39a840a22db 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Profile extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/profile', 'profile_id'); 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 155d9ed807a..d41ac39dfbb 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php @@ -27,9 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Profile_History extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - */ protected function _construct() { $this->_init('dataflow/profile_history', 'history_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Session.php b/app/code/core/Mage/Dataflow/Model/Resource/Session.php index 50349ad5df7..c93fdcec81d 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Session.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_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 Session 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_Session extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/session', 'session_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Session.php b/app/code/core/Mage/Dataflow/Model/Session.php index 774d7f58cda..ba26b0380a3 100644 --- a/app/code/core/Mage/Dataflow/Model/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Session.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 Session Model * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Session _getResource() * @method Mage_Dataflow_Model_Resource_Session getResource() * @method int getUserId() @@ -35,17 +39,11 @@ * @method Mage_Dataflow_Model_Session setDirection(string $value) * @method string getComment() * @method Mage_Dataflow_Model_Session setComment(string $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Session extends Mage_Core_Model_Abstract { - protected function _construct() { $this->_init('dataflow/session'); } - } diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml index 0735bbe0ea4..f4ce85a6be1 100644 --- a/app/code/core/Mage/Dataflow/etc/config.xml +++ b/app/code/core/Mage/Dataflow/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php index 269a0a42b7f..191ed15cc0e 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.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_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_Block_Adminhtml_Frontend_Region_Updater extends Mage_Adminhtml_Block_System_Config_Form_Field { /** diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index fb6076c0ce6..9f54a07464d 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -92,7 +92,6 @@ class Mage_Directory_Helper_Data extends Mage_Core_Helper_Abstract protected $_app; /** - * Constructor for Mage_Directory_Helper_Data * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php index e3adf559761..0b316dde5b5 100644 --- a/app/code/core/Mage/Directory/Helper/Url.php +++ b/app/code/core/Mage/Directory/Helper/Url.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) */ /** * Directory URL helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team */ class Mage_Directory_Helper_Url extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/Directory/Model/Country/Api/V2.php b/app/code/core/Mage/Directory/Model/Country/Api/V2.php index 2a79f7581f2..97212e55280 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Country/Api/V2.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/Currency/Import/Webservicex.php b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php index 4e1f7a619b8..d9d4963cd6b 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.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) */ /** @@ -23,8 +23,7 @@ * * @category Mage * @package Mage_Directory - * @author Magento Core Team - * + * @author Magento Core Team * @deprecated after 1.9.4.3 */ class Mage_Directory_Model_Currency_Import_Webservicex extends Mage_Directory_Model_Currency_Import_Abstract diff --git a/app/code/core/Mage/Directory/Model/Region/Api/V2.php b/app/code/core/Mage/Directory/Model/Region/Api/V2.php index 33fa404d2cb..c405d9aa89d 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Region/Api/V2.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/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php index be8b2003374..bb3afb0b0ce 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php @@ -29,9 +29,6 @@ */ class Mage_Directory_Model_Resource_Country_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Define main table - */ protected function _construct() { $this->_init('directory/country'); diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php index b34aa88158a..ba29e7eef30 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php @@ -27,10 +27,6 @@ */ class Mage_Directory_Model_Resource_Country_Format_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('directory/country_format'); diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml index 53ef99263ce..4f26404e96f 100644 --- a/app/code/core/Mage/Directory/etc/api.xml +++ b/app/code/core/Mage/Directory/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml index 1bb2ae4bf7d..0627bfed6a0 100644 --- a/app/code/core/Mage/Directory/etc/config.xml +++ b/app/code/core/Mage/Directory/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml index 8bfbcad4839..3bdbdff9eb7 100644 --- a/app/code/core/Mage/Directory/etc/system.xml +++ b/app/code/core/Mage/Directory/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php index 762d70687bf..670f8e152c3 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.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/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php index 14a45ca22e8..91c0aa7f49f 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.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_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) */ /** * Catalog downloadable product part block * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Block_Catalog_Product_View_Type extends Mage_Catalog_Block_Product_View_Type_Virtual { - } diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php index 14fb2a9829f..97247d3f079 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Success.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) */ /** @@ -27,7 +27,6 @@ */ class Mage_Downloadable_Block_Checkout_Success extends Mage_Checkout_Block_Onepage_Success { - /** * Return true if order(s) has one or more downloadable products * diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php index 143664924f5..d4c74905afd 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.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) */ /** * File uploader for API * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Api_Uploader extends Mage_Core_Model_File_Uploader { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php index fc6bec04792..2397bee1680 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.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 links API model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Api_V2 extends Mage_Downloadable_Model_Link_Api { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php index 184af5455a5..3732587ad8f 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.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 links validator * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Api_Validator //extends Mage_Api_Model_Resource_Abstract { diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index c7824b1f35c..2c26e567949 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.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 product type model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Product_Type extends Mage_Catalog_Model_Product_Type_Virtual { diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link.php b/app/code/core/Mage/Downloadable/Model/Resource/Link.php index 49f33050c45..baa00953d1a 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link.php @@ -27,9 +27,6 @@ */ class Mage_Downloadable_Model_Resource_Link extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource - */ protected function _construct() { $this->_init('downloadable/link', 'link_id'); diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php index 67e22598680..c9e27853cff 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php @@ -27,10 +27,6 @@ */ class Mage_Downloadable_Model_Resource_Sample extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('downloadable/sample', 'sample_id'); diff --git a/app/code/core/Mage/Downloadable/etc/adminhtml.xml b/app/code/core/Mage/Downloadable/etc/adminhtml.xml index cd5803fd8a9..785b8ab1318 100644 --- a/app/code/core/Mage/Downloadable/etc/adminhtml.xml +++ b/app/code/core/Mage/Downloadable/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/api.xml b/app/code/core/Mage/Downloadable/etc/api.xml index 1c51316f3c9..fe4a5e156b7 100644 --- a/app/code/core/Mage/Downloadable/etc/api.xml +++ b/app/code/core/Mage/Downloadable/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml index cf9c77a205a..aad31e78374 100644 --- a/app/code/core/Mage/Downloadable/etc/config.xml +++ b/app/code/core/Mage/Downloadable/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml index a2b938cc2b1..0887da8388f 100644 --- a/app/code/core/Mage/Downloadable/etc/system.xml +++ b/app/code/core/Mage/Downloadable/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php index b05ba56486e..1c5f8d2f2ec 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.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_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 $installer */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index 4618ef3d85a..44fe7b0cc89 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.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) */ /** @var Mage_Catalog_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php index 51d2e6ffb0e..465ce9a3efe 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php @@ -12,14 +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_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_Core_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( $this->getTable('core_config_data'), @@ -27,4 +28,5 @@ 'like' => 'catalog/downloadable/content_disposition' ]) ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php index 2af71f035b0..62a486535c7 100644 --- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php +++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.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,10 +27,6 @@ */ class Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator extends Zend_Validate_InArray { - - /** - * Construct - */ public function __construct() { //set data haystack diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php index cb1b81a8c98..856afa65bd1 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.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/Textarea.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php index 7e066f6846d..93acb2e3168 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.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/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php index 26e41507b0a..705cf4f14e1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.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/Updated.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php index a1516f4686f..db9b5f3a830 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.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/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php index c06adb46a6a..45cb41dd271 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.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) */ /** @@ -52,10 +52,6 @@ class Mage_Eav_Model_Entity_Attribute_Set extends Mage_Core_Model_Abstract */ protected $_eventPrefix = 'eav_entity_attribute_set'; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('eav/entity_attribute_set'); diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php index a8583f8bfa3..e55f7f82dfc 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.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/Source/Table.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php index 67041c491ef..bd251ef474d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.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/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php index e1757a35b57..1333147ecff 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Setup.php +++ b/app/code/core/Mage/Eav/Model/Entity/Setup.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/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php index 4205f04c82f..2fa566c8648 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Store.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) */ /** @@ -36,9 +36,6 @@ */ class Mage_Eav_Model_Entity_Store extends Mage_Core_Model_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_store'); diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php index c2780f0595d..4fee97e4b85 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Entity/Type.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) */ /** @@ -77,9 +77,6 @@ class Mage_Eav_Model_Entity_Type extends Mage_Core_Model_Abstract */ protected $_sets; - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type'); diff --git a/app/code/core/Mage/Eav/Model/Form/Type.php b/app/code/core/Mage/Eav/Model/Form/Type.php index f8b3f21c67f..586670b6ae4 100644 --- a/app/code/core/Mage/Eav/Model/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Form/Type.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/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php index 88d398b4692..83c3bda206f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.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/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php index a6969498668..442324458bb 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.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/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php index 1aa4b650ed2..360aefbe0de 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.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/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php index fd7a89c502b..38a5606f9c2 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.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.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php index 6a0bcd5eea4..b32e023768f 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php @@ -34,18 +34,12 @@ class Mage_Eav_Model_Resource_Entity_Attribute extends Mage_Core_Model_Resource_ */ protected static $_entityAttributes = []; - /** - * Define main table - * - */ protected function _construct() { $this->_init('eav/attribute', 'attribute_id'); } /** - * Initialize unique fields - * * @return $this */ protected function _initUniqueFields() diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php index f72c9e309c8..3e9de4fde60 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.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,10 +27,6 @@ */ class Mage_Eav_Model_Resource_Entity_Attribute_Set extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('eav/attribute_set', 'attribute_set_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php index 7a12d07368b..fa7d17e1afa 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.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,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Entity_Store extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_store', 'entity_store_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php index f5a05e72f00..5349ff17817 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.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,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Entity_Type extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type', 'entity_type_id'); 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 33f969e8a9a..1b75327c563 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php @@ -27,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Form_Element extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - */ protected function _construct() { $this->_init('eav/form_element', 'element_id'); 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 ada3b35d3d5..32353a73c2c 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php @@ -27,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Form_Fieldset extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - */ protected function _construct() { $this->_init('eav/form_fieldset', 'fieldset_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type.php index 3ac0d5176ad..ba8377495e6 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type.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) */ /** @@ -29,10 +29,6 @@ */ class Mage_Eav_Model_Resource_Form_Type extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('eav/form_type', 'type_id'); diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index 7e3ba140593..cd1b1e9a265 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php index 31065921fa1..a5e8bd2e5c5 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -15,13 +15,13 @@ * @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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index 489b56436a8..4c523ec2536 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.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 */ class Mage_GiftMessage_Helper_Url extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/GiftMessage/Model/Api/V2.php b/app/code/core/Mage/GiftMessage/Model/Api/V2.php index 99e49038989..5d18e738385 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api/V2.php +++ b/app/code/core/Mage/GiftMessage/Model/Api/V2.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/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php index 3ee58383aa6..d008243c035 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.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_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) */ /** * Gift Message resource setup * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team * @deprecated */ class Mage_GiftMessage_Model_Mysql4_Setup extends Mage_GiftMessage_Model_Resource_Setup diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php index 86dd8727a86..33dd382e3ff 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.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_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) */ /** * Gift Message resource setup * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team */ class Mage_GiftMessage_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/GiftMessage/etc/api.xml b/app/code/core/Mage/GiftMessage/etc/api.xml index 3121f74a164..bece4d998fb 100644 --- a/app/code/core/Mage/GiftMessage/etc/api.xml +++ b/app/code/core/Mage/GiftMessage/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml index 93720dcdfcc..17fefcb0d52 100644 --- a/app/code/core/Mage/GiftMessage/etc/config.xml +++ b/app/code/core/Mage/GiftMessage/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/etc/system.xml b/app/code/core/Mage/GiftMessage/etc/system.xml index 8816526f455..8c916a7fd12 100644 --- a/app/code/core/Mage/GiftMessage/etc/system.xml +++ b/app/code/core/Mage/GiftMessage/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php b/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php index dc9d892b42e..2b1f159a601 100644 --- a/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php +++ b/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.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) */ /** @@ -23,6 +23,7 @@ * * @category Mage * @package Mage_GoogleAnalytics + * @author Magento Core Team */ class Mage_GoogleAnalytics_Model_System_Config_Source_Type { diff --git a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml index 1a1140ef303..aebc84c86c4 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml index a4996b3ebfa..7fd5f157290 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml index 3de5af0c866..a193924d209 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml index d0cfa8359d3..a34a5fa3e1e 100644 --- a/app/code/core/Mage/GoogleCheckout/etc/config.xml +++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GoogleCheckout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> 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 a20bb1e0fe4..7f5e2133f12 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php @@ -27,9 +27,6 @@ */ class Mage_ImportExport_Block_Adminhtml_Import_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php index 390f7df8e3e..d6593979440 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php @@ -169,9 +169,6 @@ abstract class Mage_ImportExport_Model_Export_Entity_Abstract */ protected $_websiteIdToCode = []; - /** - * Constructor. - */ public function __construct() { $entityCode = $this->getEntityTypeCode(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php index fdb43608bf5..e75fe77e853 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php @@ -69,9 +69,6 @@ class Mage_ImportExport_Model_Export_Entity_Customer extends Mage_ImportExport_M */ protected $_permanentAttributes = [self::COL_EMAIL, self::COL_WEBSITE, self::COL_STORE]; - /** - * Constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php index 08688883d8b..c60d6637934 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -109,9 +109,6 @@ class Mage_ImportExport_Model_Export_Entity_Product extends Mage_ImportExport_Mo */ protected $_attributeScopes = []; - /** - * Constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php index 1c97fe216dd..03a5874bbc7 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.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 simple 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_Simple extends Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php index 6098ce3a9e4..90f85249a04 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php @@ -187,9 +187,6 @@ abstract class Mage_ImportExport_Model_Import_Entity_Abstract */ protected $_uniqueAttributes = []; - /** - * Constructor. - */ public function __construct() { $entityType = Mage::getSingleton('eav/config')->getEntityType($this->getEntityTypeCode()); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php index 1420a09f9e5..951e9b7efaf 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php @@ -208,9 +208,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer extends Mage_ImportExport_M */ protected $_websiteIdToCode = []; - /** - * Constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php index 814c5200a14..ddaae9ab2ca 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php @@ -128,8 +128,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer_Address extends Mage_Import protected $_regions = []; /** - * Constructor. - * * @param Mage_ImportExport_Model_Import_Entity_Customer $customer */ public function __construct(Mage_ImportExport_Model_Import_Entity_Customer $customer) diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php index 4eda964599a..ab26b526dda 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php @@ -429,10 +429,6 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo */ protected $_urlKeyAttributeId; - /** - * Constructor. - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php index 66da722239d..8f5805b39ac 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.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 simple product type * - * @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_Simple extends Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php index 1312e7d8825..95fe3e35f2c 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Uploader.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 product model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Import_Uploader extends Mage_Core_Model_File_Uploader { diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php index 7cf6f2a05d4..c8bf875c374 100644 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.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) */ /** * ImportExport setup model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team * @deprecated */ class Mage_ImportExport_Model_Mysql4_Setup extends Mage_ImportExport_Model_Resource_Setup diff --git a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php index 10333a4a900..500bb8ffcb9 100644 --- a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.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) */ /** * Backend model for product url_key attribute * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Product_Attribute_Backend_Urlkey { diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php b/app/code/core/Mage/ImportExport/Model/Resource/Setup.php index 8e655209214..1a9416bbb9b 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Setup.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) */ /** * ImportExport setup model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/ImportExport/etc/adminhtml.xml b/app/code/core/Mage/ImportExport/etc/adminhtml.xml index ed5dd5fb89e..6fc17c1094e 100644 --- a/app/code/core/Mage/ImportExport/etc/adminhtml.xml +++ b/app/code/core/Mage/ImportExport/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/etc/config.xml b/app/code/core/Mage/ImportExport/etc/config.xml index 7d770e95c56..b1614b80def 100644 --- a/app/code/core/Mage/ImportExport/etc/config.xml +++ b/app/code/core/Mage/ImportExport/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/etc/system.xml b/app/code/core/Mage/ImportExport/etc/system.xml index 86e02d67930..1ad4807b2bb 100644 --- a/app/code/core/Mage/ImportExport/etc/system.xml +++ b/app/code/core/Mage/ImportExport/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php index 799f6531bb7..7abc4cd151a 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Index/Model/Lock.php b/app/code/core/Mage/Index/Model/Lock.php index 158018b024a..a4cb5a31399 100644 --- a/app/code/core/Mage/Index/Model/Lock.php +++ b/app/code/core/Mage/Index/Model/Lock.php @@ -67,9 +67,6 @@ class Mage_Index_Model_Lock */ protected static $_lockFileResource = []; - /** - * Constructor - */ protected function __construct() { register_shutdown_function([$this, 'shutdownReleaseLocks']); 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 b14a9901987..a44aa114253 100644 --- a/app/code/core/Mage/Index/Model/Lock/Storage/Db.php +++ b/app/code/core/Mage/Index/Model/Lock/Storage/Db.php @@ -37,9 +37,6 @@ class Mage_Index_Model_Lock_Storage_Db implements Mage_Index_Model_Lock_Storage_ */ protected $_connection; - /** - * Constructor - */ public function __construct() { /** @var Mage_Core_Model_Resource $resource */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Setup.php b/app/code/core/Mage/Index/Model/Mysql4/Setup.php index 944dbf7b588..886a80ed4b5 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Setup.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_Setup extends Mage_Index_Model_Resource_Setup diff --git a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php index 61496d1a143..934fbdcd323 100644 --- a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php +++ b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php @@ -27,9 +27,6 @@ */ class Mage_Index_Model_Resource_Lock_Resource extends Mage_Core_Model_Resource { - /** - * Constructor - */ public function __construct() { $this->_connections = Mage::getSingleton('core/resource')->getConnections(); diff --git a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php index 269f628f78a..138daa8c073 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php +++ b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php @@ -28,15 +28,11 @@ class Mage_Index_Model_Resource_Process_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event object name - * * @var string */ protected $_eventObject = 'process_collection'; /** - * Event prefix name - * * @var string */ protected $_eventPrefix = 'process_collection'; diff --git a/app/code/core/Mage/Index/Model/Resource/Setup.php b/app/code/core/Mage/Index/Model/Resource/Setup.php index a81101c29b8..5b6546d9927 100644 --- a/app/code/core/Mage/Index/Model/Resource/Setup.php +++ b/app/code/core/Mage/Index/Model/Resource/Setup.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 Setup Model * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Index/etc/adminhtml.xml b/app/code/core/Mage/Index/etc/adminhtml.xml index a95ba110b37..fd20671d9eb 100644 --- a/app/code/core/Mage/Index/etc/adminhtml.xml +++ b/app/code/core/Mage/Index/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml index a25ad11e94c..8946304d3bf 100644 --- a/app/code/core/Mage/Index/etc/config.xml +++ b/app/code/core/Mage/Index/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Install/Block/Db/Type.php b/app/code/core/Mage/Install/Block/Db/Type.php index 8b6f6ae9e2c..f251582ba11 100644 --- a/app/code/core/Mage/Install/Block/Db/Type.php +++ b/app/code/core/Mage/Install/Block/Db/Type.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) */ /** * Common database config installation block * - * @author Magento Core Team + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_Block_Db_Type extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Install/Block/State.php b/app/code/core/Mage/Install/Block/State.php index 193ccf022d1..3f8497f3667 100644 --- a/app/code/core/Mage/Install/Block/State.php +++ b/app/code/core/Mage/Install/Block/State.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_Block_State extends Mage_Core_Block_Template { @@ -32,5 +32,4 @@ public function __construct() $this->setTemplate('install/state.phtml'); $this->assign('steps', Mage::getSingleton('install/wizard')->getSteps()); } - } diff --git a/app/code/core/Mage/Install/Model/Session.php b/app/code/core/Mage/Install/Model/Session.php index 0993cf5f38e..759144a13f7 100644 --- a/app/code/core/Mage/Install/Model/Session.php +++ b/app/code/core/Mage/Install/Model/Session.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_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Install/Model/Wizard.php b/app/code/core/Mage/Install/Model/Wizard.php index 5143d64f8b9..400614176a2 100644 --- a/app/code/core/Mage/Install/Model/Wizard.php +++ b/app/code/core/Mage/Install/Model/Wizard.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_Wizard { diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php index b0b759e573e..9c317a4bea3 100644 --- a/app/code/core/Mage/Install/controllers/WizardController.php +++ b/app/code/core/Mage/Install/controllers/WizardController.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_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 wizard controller + * + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_WizardController extends Mage_Install_Controller_Action { diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml index d2cb4daf817..f74ef4c7577 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml index 59b08f7da4e..3b7fd9720fc 100644 --- a/app/code/core/Mage/Install/etc/install.xml +++ b/app/code/core/Mage/Install/etc/install.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php index a776c7d24d7..41bce188bf7 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor.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) */ /** diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor.php b/app/code/core/Mage/Log/Model/Resource/Visitor.php index 4585a39add8..bb25e5ff8df 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor.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) */ /** @@ -45,10 +45,6 @@ public function __construct(array $data = []) ? $data['log_condition'] : Mage::helper('log'); } - /** - * Define main table - * - */ protected function _construct() { $this->_init('log/visitor', 'visitor_id'); diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php index cf954226bfb..8ff830c1647 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php @@ -27,10 +27,6 @@ */ class Mage_Log_Model_Resource_Visitor_Online extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource - * - */ protected function _construct() { $this->_init('log/visitor_online', 'visitor_id'); diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index ef541b6d243..4b3dd512989 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.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) */ /** diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml index 7cd0a9c0f3f..eba143c9c50 100644 --- a/app/code/core/Mage/Log/etc/config.xml +++ b/app/code/core/Mage/Log/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/etc/system.xml b/app/code/core/Mage/Log/etc/system.xml index bb6b9071d95..7fdfc5d9858 100644 --- a/app/code/core/Mage/Log/etc/system.xml +++ b/app/code/core/Mage/Log/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Log - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml index 34f9138081f..539ad558530 100644 --- a/app/code/core/Mage/Media/etc/config.xml +++ b/app/code/core/Mage/Media/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Media * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/Block/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Subscribe.php index 0bbdb9d33f9..0ff5997f640 100644 --- a/app/code/core/Mage/Newsletter/Block/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Subscribe.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) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Newsletter_Block_Subscribe extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php index aad6c61f88d..9b26473cf0d 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.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) */ /** * Newsletter subscriber model for MySQL4 * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team * @deprecated */ class Mage_Newsletter_Model_Mysql4_Subscriber extends Mage_Newsletter_Model_Resource_Subscriber diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php index db29f26b37d..3b006e04b4b 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.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 db resource * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team * @deprecated */ class Mage_Newsletter_Model_Mysql4_Template extends Mage_Newsletter_Model_Resource_Template diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php index b78d456ce3b..b287587a5a8 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php @@ -27,10 +27,6 @@ */ class Mage_Newsletter_Model_Resource_Queue extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('newsletter/queue', 'queue_id'); diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php index 95caa563513..96e12c655da 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.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) */ /** * Newsletter subscriber resource model * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_Model_Resource_Subscriber extends Mage_Core_Model_Resource_Db_Abstract { @@ -56,7 +56,6 @@ class Mage_Newsletter_Model_Resource_Subscriber extends Mage_Core_Model_Resource protected $_messagesScope = 'newsletter/session'; /** - * Initialize resource model * Get tablename from config * */ 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 64019abee49..e39ecb561c0 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php @@ -62,11 +62,6 @@ class Mage_Newsletter_Model_Resource_Subscriber_Collection extends Mage_Core_Mod */ protected $_countFilterPart = []; - /** - * Constructor - * Configures collection - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template.php b/app/code/core/Mage/Newsletter/Model/Resource/Template.php index 1fefbca6757..ea5a9b998bf 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template.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_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) */ /** * Newsletter template resource model * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_Model_Resource_Template extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('newsletter/template', 'template_id'); diff --git a/app/code/core/Mage/Newsletter/Model/Session.php b/app/code/core/Mage/Newsletter/Model/Session.php index aa27b695f5e..6f2a45deb3f 100644 --- a/app/code/core/Mage/Newsletter/Model/Session.php +++ b/app/code/core/Mage/Newsletter/Model/Session.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) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Newsletter_Model_Session extends Mage_Core_Model_Session_Abstract { public function __construct() diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index 1c4e1fd34e6..1453b6bfba0 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.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_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) */ /** * Subscriber model * + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team + * * @method Mage_Newsletter_Model_Resource_Subscriber _getResource() * @method Mage_Newsletter_Model_Resource_Subscriber getResource() * @method string getChangeStatusAt() @@ -45,10 +49,6 @@ * @method bool getImportMode() * @method bool hasCustomerFirstname() * @method bool hasCustomerLastname() - * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team */ class Mage_Newsletter_Model_Subscriber extends Mage_Core_Model_Abstract { @@ -94,9 +94,6 @@ class Mage_Newsletter_Model_Subscriber extends Mage_Core_Model_Abstract */ protected $_isStatusChanged = false; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('newsletter/subscriber'); diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php index f3584242fdf..58438fd1d29 100644 --- a/app/code/core/Mage/Newsletter/Model/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Template.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_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 model * + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team + * * @method Mage_Newsletter_Model_Resource_Template _getResource() * @method Mage_Newsletter_Model_Resource_Template getResource() * @method string getTemplateCode() @@ -47,10 +51,6 @@ * @method $this setModifiedAt(string $value) * @method bool getIsSystem() * @method $this setInlineCssFile(bool|string $value) - * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team */ class Mage_Newsletter_Model_Template extends Mage_Core_Model_Email_Template_Abstract { diff --git a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php index a2874dc7265..5afa64860a8 100644 --- a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php +++ b/app/code/core/Mage/Newsletter/controllers/SubscriberController.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) */ /** * Newsletter subscribe controller * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_SubscriberController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Newsletter/etc/adminhtml.xml b/app/code/core/Mage/Newsletter/etc/adminhtml.xml index a60822c6381..94b83228a06 100644 --- a/app/code/core/Mage/Newsletter/etc/adminhtml.xml +++ b/app/code/core/Mage/Newsletter/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml index baa9d402ff1..ab70c2a9793 100644 --- a/app/code/core/Mage/Newsletter/etc/config.xml +++ b/app/code/core/Mage/Newsletter/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/system.xml b/app/code/core/Mage/Newsletter/etc/system.xml index 867ec5d42d9..1fd10aa9e36 100644 --- a/app/code/core/Mage/Newsletter/etc/system.xml +++ b/app/code/core/Mage/Newsletter/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php index c8253e03ae8..0f7f0ddf13b 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.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/Authorize/Abstract.php b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php index 4757e971316..54647c5885e 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php @@ -52,9 +52,6 @@ abstract class Mage_Oauth_Block_Authorize_Abstract extends Mage_Core_Block_Templ */ protected $_consumer; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Oauth/Model/Resource/Setup.php b/app/code/core/Mage/Oauth/Model/Resource/Setup.php index 5d8217dd5da..c34d828b4e5 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Setup.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Setup.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_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 setup model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Token.php b/app/code/core/Mage/Oauth/Model/Resource/Token.php index 9d36a938b98..c5584388ec3 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token.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_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 token resource model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Model_Resource_Token extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php index 470d4907e80..83829bb21ec 100644 --- a/app/code/core/Mage/Oauth/Model/Token.php +++ b/app/code/core/Mage/Oauth/Model/Token.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_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 token model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team + * * @method string getName() Consumer name (joined from consumer table) * @method Mage_Oauth_Model_Resource_Token_Collection getCollection() * @method Mage_Oauth_Model_Resource_Token_Collection getResourceCollection() diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php index 45db10cb389..03107416247 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.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) */ /** @@ -23,9 +23,9 @@ * * Applications for logged admin user * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Adminhtml_Oauth_Admin_TokenController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php index 9267e46ed2a..3d3adbaff4e 100644 --- a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.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) */ /** @@ -23,9 +23,9 @@ * * Tab "My Applications" in the Customer Account * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Customer_TokenController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Oauth/controllers/TokenController.php b/app/code/core/Mage/Oauth/controllers/TokenController.php index 09d009694a6..e546f734e6f 100644 --- a/app/code/core/Mage/Oauth/controllers/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/TokenController.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_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 token controller * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_TokenController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Oauth/etc/adminhtml.xml b/app/code/core/Mage/Oauth/etc/adminhtml.xml index d7c12d549d5..a4721b948e8 100644 --- a/app/code/core/Mage/Oauth/etc/adminhtml.xml +++ b/app/code/core/Mage/Oauth/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/etc/config.xml b/app/code/core/Mage/Oauth/etc/config.xml index d871d298572..3122280df4a 100644 --- a/app/code/core/Mage/Oauth/etc/config.xml +++ b/app/code/core/Mage/Oauth/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/etc/system.xml b/app/code/core/Mage/Oauth/etc/system.xml index ee0c5021f7f..8eddc9039a8 100644 --- a/app/code/core/Mage/Oauth/etc/system.xml +++ b/app/code/core/Mage/Oauth/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Page/Block/Html/Toplinks.php b/app/code/core/Mage/Page/Block/Html/Toplinks.php index 9a08d8f0e73..f0c6b6b2d1c 100644 --- a/app/code/core/Mage/Page/Block/Html/Toplinks.php +++ b/app/code/core/Mage/Page/Block/Html/Toplinks.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_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) */ /** + * @category Mage + * @package Mage_Page + * @author Magento Core Team + * * @deprecated after 1.4.0.1 */ class Mage_Page_Block_Html_Toplinks extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu.php b/app/code/core/Mage/Page/Block/Html/Topmenu.php index 8db450e8019..35d74864273 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu.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_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) */ /** * Top menu block * - * @category Mage - * @package Mage_Page - * @author Magento Core Team + * @category Mage + * @package Mage_Page + * @author Magento Core Team */ class Mage_Page_Block_Html_Topmenu extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php index 685cf3dff7f..660168891b8 100644 --- a/app/code/core/Mage/Page/Block/Html/Welcome.php +++ b/app/code/core/Mage/Page/Block/Html/Welcome.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/Wrapper.php b/app/code/core/Mage/Page/Block/Html/Wrapper.php index 8163b8bd4e6..22ba34aa200 100644 --- a/app/code/core/Mage/Page/Block/Html/Wrapper.php +++ b/app/code/core/Mage/Page/Block/Html/Wrapper.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_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) */ /** * A generic wrapper block that renders its children and supports a few parameters of the wrapper HTML-element * + * @category Mage + * @package Mage_Page + * @author Magento Core Team + * * @method bool hasElementClass() * @method string getElementClass() * @method bool hasElementId() diff --git a/app/code/core/Mage/Page/Block/Js/Translate.php b/app/code/core/Mage/Page/Block/Js/Translate.php index 880b51b6325..529b2b6cf18 100644 --- a/app/code/core/Mage/Page/Block/Js/Translate.php +++ b/app/code/core/Mage/Page/Block/Js/Translate.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_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) */ /** * Js translation block * + * @category Mage + * @package Mage_Page + * @author Magento Core Team * @deprecated since 1.7.0.0 (used in adminhtml/default/default/layout/main.xml) - * @author Magento Core Team */ class Mage_Page_Block_Js_Translate extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/Block/Switch.php b/app/code/core/Mage/Page/Block/Switch.php index 80d12a39e64..1e432f7d011 100644 --- a/app/code/core/Mage/Page/Block/Switch.php +++ b/app/code/core/Mage/Page/Block/Switch.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_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Page_Block_Switch extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml index 54fb8bf7ec8..e0ce48b4d8b 100644 --- a/app/code/core/Mage/Page/etc/config.xml +++ b/app/code/core/Mage/Page/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Page/etc/system.xml b/app/code/core/Mage/Page/etc/system.xml index a07b4a08986..9799dfde2de 100644 --- a/app/code/core/Mage/Page/etc/system.xml +++ b/app/code/core/Mage/Page/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/Model/Control/Zend.php b/app/code/core/Mage/PageCache/Model/Control/Zend.php index 002cb861b45..3e81727173c 100644 --- a/app/code/core/Mage/PageCache/Model/Control/Zend.php +++ b/app/code/core/Mage/PageCache/Model/Control/Zend.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) */ /** * Zend server page cache control model * - * @category Mage - * @package Mage_PageCache - * @author Magento Core Team + * @category Mage + * @package Mage_PageCache + * @author Magento Core Team */ class Mage_PageCache_Model_Control_Zend implements Mage_PageCache_Model_Control_Interface { diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml index cf9ce54a937..7dd921bb50c 100644 --- a/app/code/core/Mage/PageCache/etc/adminhtml.xml +++ b/app/code/core/Mage/PageCache/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_PageCache * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/etc/config.xml b/app/code/core/Mage/PageCache/etc/config.xml index 3bfbf7ee7a3..bd8c4ac02d2 100644 --- a/app/code/core/Mage/PageCache/etc/config.xml +++ b/app/code/core/Mage/PageCache/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_PageCache * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/etc/system.xml b/app/code/core/Mage/PageCache/etc/system.xml index 7d277969c8e..393fd92f890 100644 --- a/app/code/core/Mage/PageCache/etc/system.xml +++ b/app/code/core/Mage/PageCache/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_PageCache + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/Helper/Data.php b/app/code/core/Mage/Paygate/Helper/Data.php index e92877b3c19..7593f7b271c 100644 --- a/app/code/core/Mage/Paygate/Helper/Data.php +++ b/app/code/core/Mage/Paygate/Helper/Data.php @@ -21,9 +21,9 @@ /** * Paygate data helper * - * @category Mage - * @package Mage_Paygate - * @author Magento Core Team + * @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/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml index ca4f0d7d77f..e97a2800848 100644 --- a/app/code/core/Mage/Paygate/etc/config.xml +++ b/app/code/core/Mage/Paygate/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml index 7a793d69fe4..75ef7df508e 100644 --- a/app/code/core/Mage/Paygate/etc/system.xml +++ b/app/code/core/Mage/Paygate/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index 111b95e2446..337be568054 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -21,9 +21,9 @@ /** * Payment module base helper * - * @category Mage - * @package Mage_Payment - * @author Magento Core Team + * @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/etc/adminhtml.xml b/app/code/core/Mage/Payment/etc/adminhtml.xml index 745ae9e0fcc..b7f73cb6fcf 100644 --- a/app/code/core/Mage/Payment/etc/adminhtml.xml +++ b/app/code/core/Mage/Payment/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/etc/config.xml b/app/code/core/Mage/Payment/etc/config.xml index 57ae81c869b..69ae007be95 100644 --- a/app/code/core/Mage/Payment/etc/config.xml +++ b/app/code/core/Mage/Payment/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/etc/system.xml b/app/code/core/Mage/Payment/etc/system.xml index e2120f68120..814f546ca5e 100644 --- a/app/code/core/Mage/Payment/etc/system.xml +++ b/app/code/core/Mage/Payment/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.php index 07a225e0a81..dbc6fc3d697 100644 --- a/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.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_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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php index 368034fa025..1b6304eb0b1 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.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/Store.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php index 9d6122f5c60..4fff5c1b918 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.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) */ /** * Renderer for service JavaScript code that disables corresponding paypal methods on page load - * @author Magento Core Team + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Store extends Mage_Adminhtml_Block_Abstract diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php index 7cc18b7e2ba..669b225734b 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.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/Express/Shortcut.php b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php index b8c197746d0..795d1040d58 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php +++ b/app/code/core/Mage/Paypal/Block/Express/Shortcut.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 expess checkout shortcut link * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method string getShortcutHtmlId() * @method string getImageUrl() * @method string getCheckoutUrl() diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php index dc68fd7e0fe..b9c951256eb 100644 --- a/app/code/core/Mage/Paypal/Helper/Data.php +++ b/app/code/core/Mage/Paypal/Helper/Data.php @@ -21,9 +21,9 @@ /** * Paypal Data helper * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @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/Model/Api/Standard.php b/app/code/core/Mage/Paypal/Model/Api/Standard.php index b9828b82c92..e09590252ed 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Api/Standard.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 checkout request API + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Api_Standard extends Mage_Paypal_Model_Api_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php index 5e9fa17cc28..c55aa2c46f0 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.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_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 + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated */ class Mage_Paypal_Model_Mysql4_Report_Settlement extends Mage_Paypal_Model_Resource_Report_Settlement diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php index dc6a29acfd0..8658abf53c2 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.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) */ /** * PayPal Setup Resource class * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated */ class Mage_Paypal_Model_Mysql4_Setup extends Mage_Paypal_Model_Resource_Setup diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php index d77855de9c6..73e11261f99 100644 --- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.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_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) */ /** * Payment transaction model * Tracks transaction history * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method Mage_Paypal_Model_Resource_Payment_Transaction _getResource() * @method Mage_Paypal_Model_Resource_Payment_Transaction getResource() * @method string getTxnId() * @method string getCreatedAt() * @method Mage_Paypal_Model_Payment_Transaction setCreatedAt(string $value) - * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Payment_Transaction extends Mage_Core_Model_Abstract { @@ -42,16 +42,12 @@ class Mage_Paypal_Model_Payment_Transaction extends Mage_Core_Model_Abstract protected $_isFailsafe = false; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventPrefix * @var string */ protected $_eventPrefix = 'paypal_payment_transaction'; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventObject * @var string */ diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php index 937af2d5c54..d974528ad23 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.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,8 +24,10 @@ * Perform fetching reports from remote servers with following saving them to database * Prepare report rows for Mage_Paypal_Model_Report_Settlement_Row model * - */ -/** + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method Mage_Paypal_Model_Resource_Report_Settlement _getResource() * @method Mage_Paypal_Model_Resource_Report_Settlement getResource() * @method string getReportDate() @@ -36,10 +38,6 @@ * @method Mage_Paypal_Model_Report_Settlement setFilename(string $value) * @method string getLastModified() * @method Mage_Paypal_Model_Report_Settlement setLastModified(string $value) - * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract { @@ -159,9 +157,7 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract ] ] ]; - /** - * Initialize resource model - */ + protected function _construct() { $this->_init('paypal/report_settlement'); diff --git a/app/code/core/Mage/Paypal/Model/Resource/Cert.php b/app/code/core/Mage/Paypal/Model/Resource/Cert.php index de76232fdbd..4b217140570 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Cert.php @@ -27,9 +27,6 @@ */ class Mage_Paypal_Model_Resource_Cert extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - */ protected function _construct() { $this->_init('paypal/cert', 'cert_id'); diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php index 6c474449444..3dd07665dc3 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.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_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 transaction resource model * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated since 1.6.2.0 - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Resource_Payment_Transaction extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php index 6ab95e85a2d..28f8422a6fb 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.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) */ /** * Report settlement resource model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Resource_Report_Settlement extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Resource/Setup.php b/app/code/core/Mage/Paypal/Model/Resource/Setup.php index 5875cb4e8f9..85792fec08a 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Setup.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) */ /** * PayPal Setup Resource class * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/Paypal/Model/Session.php b/app/code/core/Mage/Paypal/Model/Session.php index 1d498eea4c2..2e3a6f46fe8 100644 --- a/app/code/core/Mage/Paypal/Model/Session.php +++ b/app/code/core/Mage/Paypal/Model/Session.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 transaction session namespace * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Standard.php b/app/code/core/Mage/Paypal/Model/Standard.php index 5b020b3bd41..40602d12c38 100644 --- a/app/code/core/Mage/Paypal/Model/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Standard.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 Standard Checkout Module * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Standard extends Mage_Payment_Model_Method_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php index 342f7b18aa5..93ee0e370c3 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.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 url method: GET/POST + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_UrlMethod { /** - * Options getter - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php index 61e99ab6337..284ec5bc431 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php @@ -12,21 +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) */ /** * Used in creating options for Yes|No config value selection * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_YesnoShortcut { /** - * Options getter - * * @return array */ public function toOptionArray() @@ -36,6 +37,5 @@ public function toOptionArray() ['value' => 0, 'label' => Mage::helper('paypal')->__('No')], ]; } - } diff --git a/app/code/core/Mage/Paypal/UnavailableException.php b/app/code/core/Mage/Paypal/UnavailableException.php index ac7ced50194..f111c0aac12 100644 --- a/app/code/core/Mage/Paypal/UnavailableException.php +++ b/app/code/core/Mage/Paypal/UnavailableException.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_UnavailableException extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php index 651289d2bf1..0b0dfdc1d47 100644 --- a/app/code/core/Mage/Paypal/controllers/StandardController.php +++ b/app/code/core/Mage/Paypal/controllers/StandardController.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_StandardController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Paypal/etc/adminhtml.xml b/app/code/core/Mage/Paypal/etc/adminhtml.xml index 9859a294861..e5c4cac103b 100644 --- a/app/code/core/Mage/Paypal/etc/adminhtml.xml +++ b/app/code/core/Mage/Paypal/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml index 07bb35c38ed..3d2d9510555 100644 --- a/app/code/core/Mage/Paypal/etc/config.xml +++ b/app/code/core/Mage/Paypal/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml index fa6c03181c7..09616f77b57 100644 --- a/app/code/core/Mage/Paypal/etc/system.xml +++ b/app/code/core/Mage/Paypal/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php index 39e7256dc5e..61c35ac4499 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/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_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 */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php index 8708197bf00..a01199d41df 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.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_Paypal_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php index f3fd1c94f3f..124cd78b15b 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.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_Paypal_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php b/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php index 160a231d4c7..d19b09df07b 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.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) */ /** * Paypal expess checkout shortcut link + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Block_Express_Shortcut extends Mage_Paypal_Block_Express_Shortcut { diff --git a/app/code/core/Mage/PaypalUk/Helper/Data.php b/app/code/core/Mage/PaypalUk/Helper/Data.php index 0417742811c..9bda1a31c15 100644 --- a/app/code/core/Mage/PaypalUk/Helper/Data.php +++ b/app/code/core/Mage/PaypalUk/Helper/Data.php @@ -21,9 +21,9 @@ /** * PaypalUk data helper * - * @category Mage - * @package Mage_PaypalUk - * @author Magento Core Team + * @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/Session.php b/app/code/core/Mage/PaypalUk/Model/Session.php index 61c1aeb419e..81133556460 100644 --- a/app/code/core/Mage/PaypalUk/Model/Session.php +++ b/app/code/core/Mage/PaypalUk/Model/Session.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_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 transaction session namespace * - * @author Magento Core Team + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/PaypalUk/etc/config.xml b/app/code/core/Mage/PaypalUk/etc/config.xml index af5123f1ec5..285023077b0 100644 --- a/app/code/core/Mage/PaypalUk/etc/config.xml +++ b/app/code/core/Mage/PaypalUk/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/Helper/Session.php b/app/code/core/Mage/Persistent/Helper/Session.php index 23ed71fa0f0..d3793619d0f 100644 --- a/app/code/core/Mage/Persistent/Helper/Session.php +++ b/app/code/core/Mage/Persistent/Helper/Session.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/Model/Observer/Session.php b/app/code/core/Mage/Persistent/Model/Observer/Session.php index 93487810ce0..f99450f2c04 100644 --- a/app/code/core/Mage/Persistent/Model/Observer/Session.php +++ b/app/code/core/Mage/Persistent/Model/Observer/Session.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/Model/Resource/Session.php b/app/code/core/Mage/Persistent/Model/Resource/Session.php index 1793bb02d74..f083ad3a78d 100644 --- a/app/code/core/Mage/Persistent/Model/Resource/Session.php +++ b/app/code/core/Mage/Persistent/Model/Resource/Session.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_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) */ /** * Persistent Session Resource Model * - * @category Mage - * @package Mage_Persistent - * @author Magento Core Team + * @category Mage + * @package Mage_Persistent + * @author Magento Core Team */ class Mage_Persistent_Model_Resource_Session extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,9 +34,6 @@ class Mage_Persistent_Model_Resource_Session extends Mage_Core_Model_Resource_Db */ protected $_useIsObjectNew = true; - /** - * Initialize connection and define main table and primary key - */ protected function _construct() { $this->_init('persistent/session', 'persistent_id'); diff --git a/app/code/core/Mage/Persistent/Model/Session.php b/app/code/core/Mage/Persistent/Model/Session.php index acac0123a88..3eb32938a13 100644 --- a/app/code/core/Mage/Persistent/Model/Session.php +++ b/app/code/core/Mage/Persistent/Model/Session.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/etc/adminhtml.xml b/app/code/core/Mage/Persistent/etc/adminhtml.xml index 8129ecc2c62..da601bcabd9 100644 --- a/app/code/core/Mage/Persistent/etc/adminhtml.xml +++ b/app/code/core/Mage/Persistent/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/config.xml b/app/code/core/Mage/Persistent/etc/config.xml index c2b654b1d47..eea8e8403cb 100644 --- a/app/code/core/Mage/Persistent/etc/config.xml +++ b/app/code/core/Mage/Persistent/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/persistent.xml b/app/code/core/Mage/Persistent/etc/persistent.xml index d188cc81c11..ce8b788380c 100644 --- a/app/code/core/Mage/Persistent/etc/persistent.xml +++ b/app/code/core/Mage/Persistent/etc/persistent.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/system.xml b/app/code/core/Mage/Persistent/etc/system.xml index 793bee7fcf4..501fd97db57 100644 --- a/app/code/core/Mage/Persistent/etc/system.xml +++ b/app/code/core/Mage/Persistent/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/Helper/Data.php b/app/code/core/Mage/Poll/Helper/Data.php index 684437b57c0..4682ab7872f 100644 --- a/app/code/core/Mage/Poll/Helper/Data.php +++ b/app/code/core/Mage/Poll/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Poll - * @author Magento Core Team + * @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/Model/Mysql4/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php index 671e3a5ef51..38ab67ca286 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.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_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 vote resource model * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team + * @category Mage + * @package Mage_Poll + * @author Magento Core Team * @deprecated */ class Mage_Poll_Model_Mysql4_Poll_Vote extends Mage_Poll_Model_Resource_Poll_Vote diff --git a/app/code/core/Mage/Poll/Model/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Poll/Vote.php index 38d40b8abd5..4f752409b73 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Poll/Vote.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_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) */ /** * Pool vote model * + * @category Mage + * @package Mage_Poll + * @author Magento Core Team + * * @method Mage_Poll_Model_Resource_Poll_Vote _getResource() * @method Mage_Poll_Model_Resource_Poll_Vote getResource() * @@ -34,10 +38,6 @@ * @method $this setCustomerId(int $value) * @method string getVoteTime() * @method $this setVoteTime(string $value) - * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team */ class Mage_Poll_Model_Poll_Vote extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php index e0fdbf4d6f0..1ff2cc91ee9 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.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_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 vote resource model * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team + * @category Mage + * @package Mage_Poll + * @author Magento Core Team */ class Mage_Poll_Model_Resource_Poll_Vote extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Poll/controllers/VoteController.php b/app/code/core/Mage/Poll/controllers/VoteController.php index e4425c77ad0..6a654d478b2 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.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_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 vote controller * - * @file Vote.php - * @author Magento Core Team + * @category Mage + * @package Mage_Poll + * @author Magento Core Team */ - class Mage_Poll_VoteController extends Mage_Core_Controller_Front_Action { /** diff --git a/app/code/core/Mage/Poll/etc/adminhtml.xml b/app/code/core/Mage/Poll/etc/adminhtml.xml index 7d4ff977d50..7669b99e6b7 100644 --- a/app/code/core/Mage/Poll/etc/adminhtml.xml +++ b/app/code/core/Mage/Poll/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/config.xml b/app/code/core/Mage/Poll/etc/config.xml index 5a33d00c2b4..9d9c578291d 100644 --- a/app/code/core/Mage/Poll/etc/config.xml +++ b/app/code/core/Mage/Poll/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/system.xml b/app/code/core/Mage/Poll/etc/system.xml index 7ca21367152..fa761de1ea1 100644 --- a/app/code/core/Mage/Poll/etc/system.xml +++ b/app/code/core/Mage/Poll/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php index 14b799bc652..0e5ba4a59e5 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Stock.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,14 +23,10 @@ * * @category Mage * @package Mage_ProductAlert - * @author Magento Core Team + * @author Magento Core Team */ class Mage_ProductAlert_Block_Email_Stock extends Mage_ProductAlert_Block_Email_Abstract { - /** - * Constructor - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ProductAlert/Block/Product/View.php b/app/code/core/Mage/ProductAlert/Block/Product/View.php index fe276bf9b66..02ffa76c203 100644 --- a/app/code/core/Mage/ProductAlert/Block/Product/View.php +++ b/app/code/core/Mage/ProductAlert/Block/Product/View.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_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) */ /** * Product view price and stock alerts + * + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team + * * @method $this setSignupUrl(string $value) */ class Mage_ProductAlert_Block_Product_View extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/ProductAlert/Block/Stock.php b/app/code/core/Mage/ProductAlert/Block/Stock.php index 483014fdb07..2cfd8ade5ac 100644 --- a/app/code/core/Mage/ProductAlert/Block/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Stock.php @@ -12,13 +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) */ /** + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team * @deprecated after 1.4.1.0 * @see Mage_ProductAlert_Block_Product_View */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php index b2306c60c55..a447fba7f6d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.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_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) */ /** * Product alert for back in stock resource model * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team * @deprecated */ class Mage_ProductAlert_Model_Mysql4_Stock extends Mage_ProductAlert_Model_Resource_Stock diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php index 24cc45d486e..37f71c6f43d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php @@ -27,10 +27,6 @@ */ class Mage_ProductAlert_Model_Resource_Price extends Mage_ProductAlert_Model_Resource_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('productalert/price', 'alert_price_id'); diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php index 001648f2684..edaf0eb4f79 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.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_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) */ /** * Product alert for back in stock resource model * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team */ class Mage_ProductAlert_Model_Resource_Stock extends Mage_ProductAlert_Model_Resource_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('productalert/stock', 'alert_stock_id'); diff --git a/app/code/core/Mage/ProductAlert/Model/Stock.php b/app/code/core/Mage/ProductAlert/Model/Stock.php index 0f37f5ed03c..fe84e378f07 100644 --- a/app/code/core/Mage/ProductAlert/Model/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Stock.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_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 for back in stock model * + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team + * * @method Mage_ProductAlert_Model_Resource_Stock _getResource() * @method Mage_ProductAlert_Model_Resource_Stock getResource() * @method Mage_ProductAlert_Model_Resource_Stock_Collection getCollection() @@ -39,10 +43,6 @@ * @method $this setSendCount(int $value) * @method int getStatus() * @method $this setStatus(int $value) - * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team */ class Mage_ProductAlert_Model_Stock extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php index 8ad4ed506f2..d279981d338 100644 --- a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php +++ b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.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_UnsubscribeController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml index 10bbf9aaaa3..f2d4dcb4d3f 100644 --- a/app/code/core/Mage/ProductAlert/etc/config.xml +++ b/app/code/core/Mage/ProductAlert/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml index 4a4dc568eee..3600b2f9467 100644 --- a/app/code/core/Mage/ProductAlert/etc/system.xml +++ b/app/code/core/Mage/ProductAlert/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/Helper/Data.php b/app/code/core/Mage/Rating/Helper/Data.php index 23ab7ab656f..8b6a84f14b6 100644 --- a/app/code/core/Mage/Rating/Helper/Data.php +++ b/app/code/core/Mage/Rating/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @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/Option/Vote.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php index 68a847f5712..ea543a0ea80 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.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 vote resource model * - * @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_Option_Vote extends Mage_Rating_Model_Resource_Rating_Option_Vote diff --git a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php index fddfe910ca2..cd18b5a2684 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.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,14 +23,13 @@ * * @category Mage * @package Mage_Rating - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Rating_Model_Resource_Rating_Option_Vote_Collection getResourceCollection() * @method string getEntityPkValue() * @method int getRatingId() * @method $this setRatingOptions(Mage_Rating_Model_Resource_Rating_Option_Collection $options) */ - class Mage_Rating_Model_Rating_Option_Vote extends Mage_Core_Model_Abstract { public function __construct() diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php index c2d7eb72e4b..d2ccfbf7b66 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.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_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 vote resource model * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @category Mage + * @package Mage_Rating + * @author Magento Core Team */ class Mage_Rating_Model_Resource_Rating_Option_Vote extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('rating/rating_option_vote', 'vote_id'); diff --git a/app/code/core/Mage/Rating/etc/adminhtml.xml b/app/code/core/Mage/Rating/etc/adminhtml.xml index c8dffaa844b..ca6817e1ee3 100644 --- a/app/code/core/Mage/Rating/etc/adminhtml.xml +++ b/app/code/core/Mage/Rating/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml index 57424ccdf1e..bd6435b3a65 100644 --- a/app/code/core/Mage/Rating/etc/config.xml +++ b/app/code/core/Mage/Rating/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/Block/Product/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php index 5b08e97ab6b..88ce3c3d4df 100644 --- a/app/code/core/Mage/Reports/Block/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Viewed.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/Block/Product/Widget/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php index 84abdf8780a..9cd7da3f5b6 100644 --- a/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.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) */ /** @@ -27,10 +27,6 @@ */ class Mage_Reports_Block_Product_Widget_Viewed extends Mage_Reports_Block_Product_Viewed implements Mage_Widget_Block_Interface { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index 5f0c5206a88..08c9a04f227 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @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 39b8bacfb5d..26469f42569 100644 --- a/app/code/core/Mage/Reports/Model/Event.php +++ b/app/code/core/Mage/Reports/Model/Event.php @@ -21,9 +21,9 @@ /** * Events model * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @category Mage + * @package Mage_Reports + * @author Magento Core Team * * @method Mage_Reports_Model_Resource_Event _getResource() * @method Mage_Reports_Model_Resource_Event getResource() diff --git a/app/code/core/Mage/Reports/Model/Event/Type.php b/app/code/core/Mage/Reports/Model/Event/Type.php index bdaa4994ccc..1d1637207fb 100644 --- a/app/code/core/Mage/Reports/Model/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Event/Type.php @@ -12,27 +12,26 @@ * obtain it through 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) */ /** * Event type model * + * @category Mage + * @package Mage_Reports + * @author Magento Core Team + * * @method Mage_Reports_Model_Resource_Event_Type _getResource() * @method Mage_Reports_Model_Resource_Event_Type getResource() * @method string getEventName() * @method Mage_Reports_Model_Event_Type setEventName(string $value) * @method int getCustomerLogin() * @method Mage_Reports_Model_Event_Type setCustomerLogin(int $value) - * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team */ - class Mage_Reports_Model_Event_Type extends Mage_Core_Model_Abstract { protected function _construct() diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php index 73b59e17e93..dd00fc6b981 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.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 event type 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_Type extends Mage_Reports_Model_Resource_Event_Type diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php index 0433e11f0e5..4d03b0169d1 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.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) */ /** * Reports Viewed Product Index 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_Product_Index_Viewed extends Mage_Reports_Model_Resource_Product_Index_Viewed diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php index 89876acba1a..fb8f1e68599 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.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_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) */ /** * Catalog Viewed Product Index * + * @category Mage + * @package Mage_Reports + * @author Magento Core Team + * * @method Mage_Reports_Model_Resource_Product_Index_Viewed _getResource() * @method Mage_Reports_Model_Resource_Product_Index_Viewed getResource() * @method Mage_Reports_Model_Product_Index_Viewed setVisitorId(int $value) @@ -30,10 +34,6 @@ * @method Mage_Reports_Model_Product_Index_Viewed setStoreId(int $value) * @method string getAddedAt() * @method Mage_Reports_Model_Product_Index_Viewed setAddedAt(string $value) - * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team */ class Mage_Reports_Model_Product_Index_Viewed extends Mage_Reports_Model_Product_Index_Abstract { diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type.php index aec2ce99f93..cd5a2287faf 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type.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_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 event type 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_Type extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Main table initialization - * - */ protected function _construct() { $this->_init('reports/event_type', 'event_type_id'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php index 6d7b8b14baa..11515b63861 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php @@ -27,10 +27,6 @@ */ class Mage_Reports_Model_Resource_Product_Index_Compared extends Mage_Reports_Model_Resource_Product_Index_Abstract { - /** - * Initialize connection and main resource table - * - */ protected function _construct() { $this->_init('reports/compared_product_index', 'index_id'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php index 2402dc9d2a1..3db99e7662f 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.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_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 Viewed Product Index 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_Product_Index_Viewed extends Mage_Reports_Model_Resource_Product_Index_Abstract { - /** - * Initialize connection and main resource table - * - */ protected function _construct() { $this->_init('reports/viewed_product_index', 'index_id'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php index 6877ede7ac6..79365962df8 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.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) */ /** * Most viewed product report aggregate 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_Report_Product_Viewed extends Mage_Sales_Model_Resource_Report_Abstract { @@ -31,10 +31,6 @@ class Mage_Reports_Model_Resource_Report_Product_Viewed extends Mage_Sales_Model const AGGREGATION_MONTHLY = 'reports/viewed_aggregated_monthly'; const AGGREGATION_YEARLY = 'reports/viewed_aggregated_yearly'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init(self::AGGREGATION_DAILY, 'id'); diff --git a/app/code/core/Mage/Reports/Model/Session.php b/app/code/core/Mage/Reports/Model/Session.php index 920f0625156..93549c7cf11 100644 --- a/app/code/core/Mage/Reports/Model/Session.php +++ b/app/code/core/Mage/Reports/Model/Session.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/Test.php b/app/code/core/Mage/Reports/Model/Test.php index 1bd0ce7c9bd..c35711bc0e2 100644 --- a/app/code/core/Mage/Reports/Model/Test.php +++ b/app/code/core/Mage/Reports/Model/Test.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) */ /** @@ -23,12 +23,10 @@ * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Reports_Model_Test extends Varien_Object { - /** * @return false|string */ diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php index 0fd6cfca9c6..002f06ca0b1 100644 --- a/app/code/core/Mage/Reports/Model/Totals.php +++ b/app/code/core/Mage/Reports/Model/Totals.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Reports_Model_Totals { diff --git a/app/code/core/Mage/Reports/etc/adminhtml.xml b/app/code/core/Mage/Reports/etc/adminhtml.xml index 48f706d6bbd..053bdfc9bfc 100644 --- a/app/code/core/Mage/Reports/etc/adminhtml.xml +++ b/app/code/core/Mage/Reports/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml index a8bb8ceb3bc..406d4a6e5ad 100644 --- a/app/code/core/Mage/Reports/etc/config.xml +++ b/app/code/core/Mage/Reports/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml index f0d65824ac1..6c0a1379732 100644 --- a/app/code/core/Mage/Reports/etc/system.xml +++ b/app/code/core/Mage/Reports/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/widget.xml b/app/code/core/Mage/Reports/etc/widget.xml index 60cca66f695..60c1328d3b5 100644 --- a/app/code/core/Mage/Reports/etc/widget.xml +++ b/app/code/core/Mage/Reports/etc/widget.xml @@ -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_Reports - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 591aac18987..26fc007ec22 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.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_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(); $aggregationTables = [ diff --git a/app/code/core/Mage/Review/Block/Customer/View.php b/app/code/core/Mage/Review/Block/Customer/View.php index f9091beb7b0..28c3ace359d 100644 --- a/app/code/core/Mage/Review/Block/Customer/View.php +++ b/app/code/core/Mage/Review/Block/Customer/View.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 string getReviewId() * @method $this setReviewId(string $value) diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php index 6bf333a80ac..64cbc4bf5ac 100644 --- a/app/code/core/Mage/Review/Block/Product/View.php +++ b/app/code/core/Mage/Review/Block/Product/View.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/Block/View.php b/app/code/core/Mage/Review/Block/View.php index 9aff1bbbcf3..0e342076eb1 100644 --- a/app/code/core/Mage/Review/Block/View.php +++ b/app/code/core/Mage/Review/Block/View.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 Mage_Rating_Model_Resource_Rating_Option_Vote_Collection|false getRatingCollection() * @method $this setRatingCollection(Mage_Rating_Model_Resource_Rating_Option_Vote_Collection|false $value) diff --git a/app/code/core/Mage/Review/Helper/Data.php b/app/code/core/Mage/Review/Helper/Data.php index 81cdaf6c131..17dd3bc27b3 100644 --- a/app/code/core/Mage/Review/Helper/Data.php +++ b/app/code/core/Mage/Review/Helper/Data.php @@ -21,9 +21,9 @@ /** * Default review helper * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @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/Model/Mysql4/Review/Summary.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php index ff5b08711ea..2cb0046e6cc 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.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_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) */ /** * Review summary resource model * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team * @deprecated */ class Mage_Review_Model_Mysql4_Review_Summary extends Mage_Review_Model_Resource_Review_Summary diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php index 8f2ae1f7bc8..c10b8743904 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review.php +++ b/app/code/core/Mage/Review/Model/Resource/Review.php @@ -78,7 +78,6 @@ class Mage_Review_Model_Resource_Review extends Mage_Core_Model_Resource_Db_Abst /** * Define main table. Define other tables name - * */ protected function _construct() { diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Status.php b/app/code/core/Mage/Review/Model/Resource/Review/Status.php index 467888d918f..12c791ca7b2 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Status.php @@ -12,26 +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_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) */ /** * Review status resource model * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team */ class Mage_Review_Model_Resource_Review_Status extends Mage_Core_Model_Resource_Db_Abstract { - - /** - * Resource status model initialization - * - */ protected function _construct() { $this->_init('review/review_status', 'status_id'); diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php index 64646a58a05..d4d6d78b1c1 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary.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_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) */ /** * Review summary resource model * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team */ class Mage_Review_Model_Resource_Review_Summary extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Review/Model/Review/Status.php b/app/code/core/Mage/Review/Model/Review/Status.php index 52b1e4f0b2f..fc9afa03155 100644 --- a/app/code/core/Mage/Review/Model/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Review/Status.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,12 +23,10 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Review_Model_Review_Status extends Mage_Core_Model_Abstract { - public function __construct() { $this->_init('review/review_status'); diff --git a/app/code/core/Mage/Review/Model/Review/Summary.php b/app/code/core/Mage/Review/Model/Review/Summary.php index fc8675143df..1d05fba0275 100644 --- a/app/code/core/Mage/Review/Model/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Review/Summary.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,13 +23,12 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team * * @method $this setStoreId(int $value) */ class Mage_Review_Model_Review_Summary extends Mage_Core_Model_Abstract { - public function __construct() { $this->_init('review/review_summary'); diff --git a/app/code/core/Mage/Review/Model/Session.php b/app/code/core/Mage/Review/Model/Session.php index c1684ac1815..f3c54c5dac9 100644 --- a/app/code/core/Mage/Review/Model/Session.php +++ b/app/code/core/Mage/Review/Model/Session.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 array getFormData() * @method $this setFormData(array $value) diff --git a/app/code/core/Mage/Review/etc/adminhtml.xml b/app/code/core/Mage/Review/etc/adminhtml.xml index de74df73fac..bb1007c80fe 100644 --- a/app/code/core/Mage/Review/etc/adminhtml.xml +++ b/app/code/core/Mage/Review/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml index a866e670aa9..c8db6caccb6 100644 --- a/app/code/core/Mage/Review/etc/config.xml +++ b/app/code/core/Mage/Review/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/etc/system.xml b/app/code/core/Mage/Review/etc/system.xml index e2cca1c4b14..d4df9f20373 100644 --- a/app/code/core/Mage/Review/etc/system.xml +++ b/app/code/core/Mage/Review/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php index 2d9065020a8..7c08e8d88b3 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Special.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Special.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Catalog_Special extends Mage_Rss_Block_Catalog_Abstract { diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php index 5f4ef4d0a3b..6688bf17ff1 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Catalog_Tag extends Mage_Rss_Block_Catalog_Abstract { diff --git a/app/code/core/Mage/Rss/Block/Order/Status.php b/app/code/core/Mage/Rss/Block/Order/Status.php index 842171a48f6..c34b486e641 100644 --- a/app/code/core/Mage/Rss/Block/Order/Status.php +++ b/app/code/core/Mage/Rss/Block/Order/Status.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Order_Status extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php index 19a39984287..17902ff1ee9 100644 --- a/app/code/core/Mage/Rss/Block/Wishlist.php +++ b/app/code/core/Mage/Rss/Block/Wishlist.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/Model/Session.php b/app/code/core/Mage/Rss/Model/Session.php index 09e95d30133..c19d3e65257 100644 --- a/app/code/core/Mage/Rss/Model/Session.php +++ b/app/code/core/Mage/Rss/Model/Session.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Admin_Model_User getAdmin() * @method Mage_Customer_Model_Customer getCustomer() diff --git a/app/code/core/Mage/Rss/etc/adminhtml.xml b/app/code/core/Mage/Rss/etc/adminhtml.xml index 2bfd6cf6094..a15d07b9720 100644 --- a/app/code/core/Mage/Rss/etc/adminhtml.xml +++ b/app/code/core/Mage/Rss/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml index c161c60b10d..13eb457d1d8 100644 --- a/app/code/core/Mage/Rss/etc/config.xml +++ b/app/code/core/Mage/Rss/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/etc/system.xml b/app/code/core/Mage/Rss/etc/system.xml index 21c3c2082c2..7e0bf63fab6 100644 --- a/app/code/core/Mage/Rss/etc/system.xml +++ b/app/code/core/Mage/Rss/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rule/Helper/Data.php b/app/code/core/Mage/Rule/Helper/Data.php index 14f623c0311..1f7476b40a4 100644 --- a/app/code/core/Mage/Rule/Helper/Data.php +++ b/app/code/core/Mage/Rule/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Rule - * @author Magento Core Team + * @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/Resource/Rule/Condition/SqlBuilder.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php index 3d281228993..343608af991 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php @@ -12,24 +12,26 @@ * obtain it through 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_Model_Resource_Rule_Condition_SqlBuilder { /** * Database adapter - * * @var Varien_Db_Adapter_Interface */ protected $_adapter; /** - * Constructor - * * @param array $config */ public function __construct(array $config = []) diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml index 6ef6904a9b8..38f49127356 100644 --- a/app/code/core/Mage/Rule/etc/config.xml +++ b/app/code/core/Mage/Rule/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php index 50ddb9e7b7f..b555c7f63c7 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.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 * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_View extends Mage_Adminhtml_Block_Widget_Form_Container { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php index 2fae2d30d9c..d491fa77140 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.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_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 tabs view * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_View_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Initialize tab - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php index 1b1b42abe5d..466fb010dce 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.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 view page * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method string getDestElementId() * @method $this setViewHtml(string $value) */ diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php index e1ad0ac4112..bb2b3879b73 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.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) */ /** * Customer account billing agreement view block * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * * @method $this setAgreementCreatedAt(string $value) * @method $this setAgreementUpdatedAt(string $value) diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php index 6d308a145e6..6008ff025b2 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.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_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_Block_Order_Creditmemo_Totals extends Mage_Sales_Block_Order_Totals { diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php index a72cb7bb123..261fff91adf 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.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_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_Block_Order_Invoice_Totals extends Mage_Sales_Block_Order_Totals { diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php index 47715f3d2b6..32b39785600 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.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_Order_Print_Shipment extends Mage_Sales_Block_Items_Abstract { /** diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php index 9eb87ee0dc1..a95cd1bcdbe 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Block_Order_Shipment extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/Tax.php b/app/code/core/Mage/Sales/Block/Order/Tax.php index f73dd376357..d92d264cfb4 100644 --- a/app/code/core/Mage/Sales/Block/Order/Tax.php +++ b/app/code/core/Mage/Sales/Block/Order/Tax.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_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 order view tax block * - * @deprecated after 1.3.2.2 * @category Mage * @package Mage_Sales * @author Magento Core Team + * @deprecated after 1.3.2.2 */ class Mage_Sales_Block_Order_Tax extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/Totals.php b/app/code/core/Mage/Sales/Block/Order/Totals.php index dc5235d250b..c7742fc2970 100644 --- a/app/code/core/Mage/Sales/Block/Order/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Totals.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_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_Block_Order_Totals extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php index 379b3770e4e..eaca59540df 100644 --- a/app/code/core/Mage/Sales/Block/Order/View.php +++ b/app/code/core/Mage/Sales/Block/Order/View.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Block_Order_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php index c63320c4a94..18e5d04bc4d 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.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) */ /** * Recurring profile view + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Recurring_Profile_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php index 8d4e08089cb..19050e31528 100644 --- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php +++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php @@ -12,22 +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_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 order view block * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method int getCustomerId() * @method Mage_Sales_Model_Resource_Order_Collection getOrders() * @method $this setOrders(Mage_Sales_Model_Resource_Order_Collection $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Block_Reorder_Sidebar extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php index 24483393aaf..aacf26f9312 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.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/Api2/Order/Address/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php index 04e24a7e9b2..48bc084cb5a 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.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/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php index fa60026b64a..664dfdb73d7 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.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/Api2/Order/Comment/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php index 79c6450565b..4297e7b4ccd 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.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/Api2/Order/Item/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php index 2199d0c7931..568e131c3f4 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.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/Api2/Order/Item/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php index a6d0ec35200..edb0ae75bb8 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.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/Api2/Order/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php index ef4bd514121..9bc6b98975e 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.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/Api2/Order/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php index de13f146de7..5e0f69b9ae6 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.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/Email/Template.php b/app/code/core/Mage/Sales/Model/Email/Template.php index 4fbd4018c37..849eac4124b 100644 --- a/app/code/core/Mage/Sales/Model/Email/Template.php +++ b/app/code/core/Mage/Sales/Model/Email/Template.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_Email_Template extends Mage_Core_Model_Email_Template { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php index ffe33fb9829..73244a14c82 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.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_Model_Entity_Order_Attribute_Backend_Shipping extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php index d7f9d370b55..11dc7ad0d96 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.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_Model_Entity_Order_Shipment extends Mage_Eav_Model_Entity_Abstract { public function __construct() diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php index 1920a72df27..1968ddca74b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Order_Shipment_Track extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php index ac5c448e9cd..0c3a446d28c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php index 399ce193e77..90363fddb3f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.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_Shipping extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php index 47309b88942..7317c3b6684 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.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_Subtotal extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php index e85ed1b7a10..1da4c91b06a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.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_Tax extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Setup.php b/app/code/core/Mage/Sales/Model/Entity/Setup.php index 2f403b19006..a4656c2c898 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Setup.php +++ b/app/code/core/Mage/Sales/Model/Entity/Setup.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_Setup extends Mage_Eav_Model_Entity_Setup { /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php index 0bc9943b005..868ac0a4fc7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.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 shipping address backend * - * @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_Attribute_Backend_Shipping extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php index 7483200b387..e9668733c59 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.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 transaction resource model * - * @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_Payment_Transaction extends Mage_Sales_Model_Resource_Order_Payment_Transaction diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php index 94339091c83..dfd81e8ffe8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.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 shipment 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_Shipment extends Mage_Sales_Model_Resource_Order_Shipment diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php index c8f4a0c5c0c..b8200f6250e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.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 shipment comment 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_Shipment_Track extends Mage_Sales_Model_Resource_Order_Shipment_Track diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php index 7f464364184..abd14d33f6e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.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) */ /** * Order status resource model + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Order_Status extends Mage_Sales_Model_Resource_Order_Status diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php index 57c892f02e2..d18e6a516d8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.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_Order_Tax extends Mage_Sales_Model_Resource_Order_Tax diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php index 397061bee50..b9028f9cd8a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.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_Shipping extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php index e2c3f3252b7..f99fa49d4c0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.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_Subtotal extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php index 3f5cf396dbc..debc2f9d2d8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.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_Tax extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php index d41899f0b94..1e569efb5d0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.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_Report_Shipping extends Mage_Sales_Model_Resource_Report_Shipping diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php index 696eacaa3d2..7f977087232 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.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 report shipping collection * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Shipment extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php index 6bdc94f043b..5d53e927677 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.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_Setup extends Mage_Sales_Model_Resource_Setup diff --git a/app/code/core/Mage/Sales/Model/Order/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Api/V2.php index 8d503ae4004..eec2c2046d5 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Api/V2.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/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php index a2dea4471da..05c022a6c8c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Config.php @@ -41,9 +41,6 @@ class Mage_Sales_Model_Order_Config extends Mage_Core_Model_Config_Base */ private $_states; - /** - * Constructor - */ public function __construct() { parent::__construct(Mage::getConfig()->getNode('global/sales/order')); diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php index c663007fa62..70417ce81e1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.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,7 +27,6 @@ */ class Mage_Sales_Model_Order_Creditmemo_Api_V2 extends Mage_Sales_Model_Order_Creditmemo_Api { - /** * Prepare filters * diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php index 529b501cd12..62e14ea540c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php @@ -34,9 +34,6 @@ class Mage_Sales_Model_Order_Creditmemo_Config extends Mage_Sales_Model_Order_To */ protected $_collectorsCacheKey = 'sorted_order_creditmemo_collectors'; - /** - * Constructor - */ public function __construct() { parent::__construct(Mage::getConfig()->getNode('global/sales/order_creditmemo')); diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php index 6c70f7c9635..a9e52d44861 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.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 creditmemo shipping total calculation model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Order_Creditmemo_Total_Shipping extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php index c311ee85235..d8bfe19b8e0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.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_Subtotal extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php index bfa4bc3e3ba..cee2f9b54c1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.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_Order_Creditmemo_Total_Tax + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Order_Creditmemo_Total_Tax extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php index e20c0774cc8..f890dd6ba6d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.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/Invoice/Config.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php index e71cf102e8d..7127fa5b430 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php @@ -34,9 +34,6 @@ class Mage_Sales_Model_Order_Invoice_Config extends Mage_Sales_Model_Order_Total */ protected $_collectorsCacheKey = 'sorted_order_invoice_collectors'; - /** - * Constructor - */ public function __construct() { parent::__construct(Mage::getConfig()->getNode('global/sales/order_invoice')); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php index 161b1febc82..b23b3a8986b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Order_Invoice_Total_Shipping extends Mage_Sales_Model_Order_Invoice_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php index b75176af519..28cfaabc243 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.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_Subtotal extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php index 626bb129c62..720651d0793 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.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_Order_Invoice_Total_Tax + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Order_Invoice_Total_Tax extends Mage_Sales_Model_Order_Invoice_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index 1b5ff91ef17..f03c74a77cb 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -245,15 +245,11 @@ class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info protected $_transactionsLookup = []; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_payment'; /** - * Event object - * * @var string */ protected $_eventObject = 'payment'; diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php index 10cf509ebf0..3cd31d56825 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.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,9 @@ * Tracks transaction history, allows to build transactions hierarchy * By default transactions are saved as closed. * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * * @method Mage_Sales_Model_Resource_Order_Payment_Transaction _getResource() * @method Mage_Sales_Model_Resource_Order_Payment_Transaction getResource() @@ -117,31 +117,22 @@ class Mage_Sales_Model_Order_Payment_Transaction extends Mage_Core_Model_Abstrac protected $_hasChild = null; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventPrefix * @var string */ protected $_eventPrefix = 'sales_order_payment_transaction'; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventObject * @var string */ protected $_eventObject = 'order_payment_transaction'; /** - * Order website id - * * @var int */ protected $_orderWebsiteId = null; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_payment_transaction'); diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php index 9b3df96c447..5aaa117a1b9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.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/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php index f37961a05b5..6fbc33942cd 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.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) */ /** * Sales order shipment model * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Shipment _getResource() * @method Mage_Sales_Model_Resource_Order_Shipment getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Collection getCollection() @@ -52,10 +56,6 @@ * @method $this setTotalWeight(float $value) * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Shipment extends Mage_Sales_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php index 1ba8f36f1fb..c10d15a0336 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.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/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php index ec840622a64..90438236927 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.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) */ /** * Class Mage_Sales_Model_Order_Shipment_Track * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Shipment_Track _getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Track getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Track_Collection getCollection() @@ -45,10 +49,6 @@ * @method $this setUpdatedAt(string $value) * @method float getWeight() * @method $this setWeight(float $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Shipment_Track extends Mage_Sales_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Status.php b/app/code/core/Mage/Sales/Model/Order/Status.php index 5df209707e7..a61af8a72d9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Order/Status.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) */ /** * Class Mage_Sales_Model_Order_Status + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Status _getResource() * @method Mage_Sales_Model_Resource_Order_Status getResource() * @method Mage_Sales_Model_Resource_Order_Status_Collection getCollection() diff --git a/app/code/core/Mage/Sales/Model/Order/Tax.php b/app/code/core/Mage/Sales/Model/Order/Tax.php index 9406d615d0a..86ec28b193f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Tax.php @@ -12,13 +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 * * @method Mage_Sales_Model_Resource_Order_Tax _getResource() * @method Mage_Sales_Model_Resource_Order_Tax getResource() @@ -44,10 +47,6 @@ * @method Mage_Sales_Model_Order_Tax setBaseRealAmount(float $value) * @method int getHidden() * @method Mage_Sales_Model_Order_Tax setHidden(int $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Tax extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Total.php b/app/code/core/Mage/Sales/Model/Order/Total.php index 92e354b2be1..642b85b124e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total.php +++ b/app/code/core/Mage/Sales/Model/Order/Total.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_Total extends Varien_Object { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php index 91475cef2af..6f3010ebb26 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total.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) */ /** * Class Mage_Sales_Model_Quote_Address_Total * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Quote_Address getAddress() * @method $this setAddress(Mage_Sales_Model_Quote_Address $value) * @method string getCode() diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php index 476f6e7e72a..4b113f25441 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php @@ -19,9 +19,9 @@ */ /** - * @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_Custbalance extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php index f173594049e..42327c4dc58 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.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 trial payment + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Recurring_Trial extends Mage_Sales_Model_Quote_Address_Total_Nominal_RecurringAbstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php index e457683fcc1..6afc55ec8d6 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.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) */ /** * Nominal shipping total + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Shipping extends Mage_Sales_Model_Quote_Address_Total_Shipping { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php index 78bfa07b789..3f8b6b8515d 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.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) */ /** * Nominal subtotal total + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Subtotal extends Mage_Sales_Model_Quote_Address_Total_Subtotal { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php index 29c7d181f2c..87ca15b0ed1 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.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_Quote_Address_Total_Shipping extends Mage_Sales_Model_Quote_Address_Total_Abstract { public function __construct() diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php index 9caad430c6c..57db140f3a5 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.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_Subtotal + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Subtotal extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php index 8e57589ca65..edaf794a259 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.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_Quote_Address_Total_Tax extends Mage_Sales_Model_Quote_Address_Total_Abstract { protected $_appliedTaxes = []; diff --git a/app/code/core/Mage/Sales/Model/Resource/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order.php index 6c9c1dd60f0..23677580ce7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_resource'; /** - * Event object - * * @var string */ protected $_eventObject = 'resource'; @@ -49,8 +45,6 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Ab protected $_grid = true; /** - * Use increment id - * * @var boolean */ protected $_useIncrementId = true; @@ -62,10 +56,6 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Ab */ protected $_entityCodeForIncrementId = 'order'; - /** - * Model Initialization - * - */ protected function _construct() { $this->_init('sales/order', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php index 31d4c5f422a..fa620f4aa2f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php @@ -70,15 +70,11 @@ abstract class Mage_Sales_Model_Resource_Order_Abstract extends Mage_Sales_Model protected $_gridColumns = null; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_resource'; /** - * Event object - * * @var string */ protected $_eventObject = 'resource'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php index 07cfc0c43a3..37624aae10a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php @@ -28,8 +28,6 @@ class Mage_Sales_Model_Resource_Order_Address extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_address_resource'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php index f6357543a22..a76bbb5d8a4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Address_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_address_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_address_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_address'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php index 30b1106f238..a4448afdc87 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.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 shipping address backend * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php index cc10edfbf07..a79adbf5af4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php index b56a999b19c..9af5e754e94 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php @@ -28,8 +28,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_resource'; @@ -55,10 +53,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo extends Mage_Sales_Model_Resour */ protected $_entityTypeForIncrementId = 'creditmemo'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/creditmemo', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php index 3395e866ca8..2f1b4e09533 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_collection'; @@ -48,10 +44,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Collection extends Mage_Sales_M */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_creditmemo'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php index e66dcd8451b..0e2f6aacdda 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Comment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/creditmemo_comment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php index 05c7a970215..51b090d96f7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_comment_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php index c61229879b6..21d622a6fee 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_grid_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php index 112e1795f5f..2e8a9ffe092 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_item_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_creditmemo_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php index 2e9c7f9db95..02fc27a71fb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php @@ -28,30 +28,20 @@ class Mage_Sales_Model_Resource_Order_Grid_Collection extends Mage_Sales_Model_Resource_Order_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_grid_collection'; /** - * Customer mode flag - * * @var bool */ protected $_customerModeFlag = false; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php index 8e86cb61326..634984c1379 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php @@ -28,8 +28,6 @@ class Mage_Sales_Model_Resource_Order_Invoice extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_resource'; @@ -55,10 +53,6 @@ class Mage_Sales_Model_Resource_Order_Invoice extends Mage_Sales_Model_Resource_ */ protected $_entityTypeForIncrementId = 'invoice'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/invoice', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php index e335250e319..b03ca09d105 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order_Invoice_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_collection'; @@ -48,10 +44,6 @@ class Mage_Sales_Model_Resource_Order_Invoice_Collection extends Mage_Sales_Mode */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_invoice'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php index 1523c926024..74496409a88 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Invoice_Comment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/invoice_comment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php index 846f1e3ec37..732bf55b6ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_comment_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php index 7a3502f0e68..9af2bd678cc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_grid_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php index 0379c06ab30..751ae733213 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Invoice_Item extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/invoice_item', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php index c6fd5eff55b..a461e9aa14e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Invoice_Item_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_item_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_invoice_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php index c9965a09139..8146a601b78 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Item extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_item', 'item_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php index b31b6079f26..2fb7bcc6b88 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order_Item_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_item_collection'; @@ -48,10 +44,6 @@ class Mage_Sales_Model_Resource_Order_Item_Collection extends Mage_Sales_Model_R */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php index 27b8d44cc2f..3a779207931 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php @@ -37,16 +37,10 @@ class Mage_Sales_Model_Resource_Order_Payment extends Mage_Sales_Model_Resource_ ]; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_payment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_payment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php index 950d502b2ca..c4f3a5aa786 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Payment_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_payment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_payment_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_payment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php index 09000845bcf..9e8bf453dc3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.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 transaction 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_Order_Payment_Transaction extends Mage_Sales_Model_Resource_Order_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php index d491b579637..4a3bd361f35 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php @@ -12,24 +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_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 shipment 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_Shipment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_resource'; @@ -42,23 +40,15 @@ class Mage_Sales_Model_Resource_Order_Shipment extends Mage_Sales_Model_Resource protected $_grid = true; /** - * Use increment id - * * @var bool */ protected $_useIncrementId = true; /** - * Entity type for increment id - * * @var string */ protected $_entityTypeForIncrementId = 'shipment'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php index 2215f3a3b05..8ef048d3e3e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php @@ -31,15 +31,11 @@ class Mage_Sales_Model_Resource_Order_Shipment_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_collection'; @@ -51,10 +47,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Collection extends Mage_Sales_Mod */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php index 538d11ab65a..e46d45d7bcd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Shipment_Comment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment_comment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php index 51969fb4e1c..9c3471c6275 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_comment_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment_comment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php index d55a85cdf47..38526a4ebbc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_grid_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php index 551afc76f89..94982e46dfe 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Shipment_Item extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment_item', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php index 68b9d42d3a2..fad42cfcc65 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Shipment_Item_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_item_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php index 053f5e31c39..d9d43f74f49 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php @@ -12,32 +12,26 @@ * obtain it through 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 shipment comment 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_Shipment_Track extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment_track', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php index 5d8ec0c4e38..f435bc097b3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php @@ -31,15 +31,11 @@ class Mage_Sales_Model_Resource_Order_Shipment_Track_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_track_collection'; @@ -51,10 +47,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Track_Collection extends Mage_Sal */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment_track'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php index 0a37f8026f0..2c934d8218e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status.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 status 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_Order_Status extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php index fd379f6bf67..a6e99c366bf 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Status_History_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_status_history_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_status_history'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php index 4dceee9547d..5c30ad69244 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.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_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 Tax Model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Tax extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_tax', 'tax_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php index a39dad63945..b16de61e0b3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Order_Tax_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_tax', 'sales/order_tax'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php index efee14e175c..b98ce11aa06 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.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 shipping 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_Shipping extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php index 78717dee0ae..9e4b563b5ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.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 subtotal 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_Subtotal extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php index 769d3bacc40..24a7fb38185 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.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 tax 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_Tax extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php index 0f4cd93e293..3f65e33a2b8 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Quote_Address_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_quote_address_collection'; /** - * Event object name - * * @var string */ protected $_eventObject = 'quote_address_collection'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php index bef4b5690a6..8c331f0954a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Recurring_Profile_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_recurring_profile_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'recurring_profile_collection'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php index cce76e57ef6..9f5a69f1560 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Report_Invoiced extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_setResource('sales'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php index d28dc3e567c..5f88cc7bb64 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Report_Order extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_aggregated_created', 'id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php index 5f6709bc97c..fda88826f7f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Report_Order_Createdat extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_aggregated_created', 'id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php index ce83bd7f25b..e9c8edb17b7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.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_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 entity resource model with aggregation by updated at * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Report_Order_Updatedat extends Mage_Sales_Model_Resource_Report_Order_Createdat { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_aggregated_updated', 'id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php index aaaa2212827..0ec9f14356b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.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_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) */ /** * Shipping report 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_Report_Shipping extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_setResource('sales'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php index fae74663be0..a46f935e938 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.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_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 report shipping collection * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Order { - /** - * Initialize custom resource model - * - */ public function __construct() { $this->setModel('adminhtml/report_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Setup.php b/app/code/core/Mage/Sales/Model/Resource/Setup.php index 8a0d3adc44c..2f400f48013 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sales/Model/Resource/Setup.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) */ /** * Setup Model of Sales Module * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Sales/etc/adminhtml.xml b/app/code/core/Mage/Sales/etc/adminhtml.xml index 4d2f1a31e36..d000c2d6fc5 100644 --- a/app/code/core/Mage/Sales/etc/adminhtml.xml +++ b/app/code/core/Mage/Sales/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/api.xml b/app/code/core/Mage/Sales/etc/api.xml index 9f35786e65f..bcc5f9a47b0 100644 --- a/app/code/core/Mage/Sales/etc/api.xml +++ b/app/code/core/Mage/Sales/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/api2.xml b/app/code/core/Mage/Sales/etc/api2.xml index 06ceaabdc40..580cd414d27 100644 --- a/app/code/core/Mage/Sales/etc/api2.xml +++ b/app/code/core/Mage/Sales/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml index 13b2c1fc641..db0c84fdbe4 100644 --- a/app/code/core/Mage/Sales/etc/config.xml +++ b/app/code/core/Mage/Sales/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml index 6180f62b0e5..c98aa329f4b 100644 --- a/app/code/core/Mage/Sales/etc/system.xml +++ b/app/code/core/Mage/Sales/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/widget.xml b/app/code/core/Mage/Sales/etc/widget.xml index 9f977002269..cfe91e9ed4b 100644 --- a/app/code/core/Mage/Sales/etc/widget.xml +++ b/app/code/core/Mage/Sales/etc/widget.xml @@ -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_Sales - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php index 17da1c91d0e..f06cc7ea6fd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/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_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/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php index 6cd76123e12..0823196ca25 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.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_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 */ $installer = $this; $installer->startSetup(); + $installer->getConnection() ->addColumn($installer->getTable('sales/shipment'), 'packages', [ 'type' => Varien_Db_Ddl_Table::TYPE_TEXT, diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php index 847c77f593d..eb7e61e04b2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -12,14 +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_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 */ $installer = $this; + $installer->getConnection() ->addColumn($installer->getTable('sales/shipment'), 'shipping_label', [ 'type' => Varien_Db_Ddl_Table::TYPE_VARBINARY, diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php index e68fee55c77..92ef815c009 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php @@ -12,18 +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_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) - */ - -/** - * Create aggregation tables for updated_at fields + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $connection->createTable($connection->createTableByDdl( $installer->getTable('sales/order_aggregated_created'), diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php index 0c882a70145..590e0482472 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php @@ -12,14 +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_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 */ $installer = $this; + $installer->getConnection() ->addColumn($installer->getTable('sales/order_item'), 'base_tax_refunded', [ 'type' => Varien_Db_Ddl_Table::TYPE_DECIMAL, diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php index 3937a7c49c7..6fbcd3aa377 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/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_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/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php index e17bcb6c030..07b059475ab 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.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/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php index 6eed9d27e26..415b5c6760a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.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/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php index c19421176e2..60acc51e3a7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.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_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 */ $installer = $this; - $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.php index 68a81f720df..d81d4569c4f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.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_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 */ $installer = $this; - $installer->startSetup(); $bestsellersTables = [$installer->getTable('sales/bestsellers_aggregated_daily'), diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index c594dcbcb3a..8c4b8e67d5f 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @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/Mysql4/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php index 2169facb168..6b52255cc74 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.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) */ /** * SalesRule Mysql4 Coupon Usage Resource Model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team * @deprecated */ class Mage_SalesRule_Model_Mysql4_Coupon_Usage extends Mage_SalesRule_Model_Resource_Coupon_Usage diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php index b8cff3c1a50..c2f4f7fac87 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php @@ -27,9 +27,6 @@ */ class Mage_SalesRule_Model_Resource_Coupon extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor adds unique fields - */ protected function _construct() { $this->_init('salesrule/coupon', 'coupon_id'); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php index ada37df55b8..3f1aaa596f1 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php @@ -27,10 +27,6 @@ */ class Mage_SalesRule_Model_Resource_Coupon_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php index b2c948c0862..8af54d87324 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.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_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 Model Resource Coupon_Usage * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Resource_Coupon_Usage extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor - * - */ protected function _construct() { $this->_init('salesrule/coupon_usage', ''); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php index 0bff8bcffe2..4ec16acd10d 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.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_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) */ /** * Rule report resource model with aggregation by updated at * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Resource_Report_Rule_Updatedat extends Mage_SalesRule_Model_Resource_Report_Rule_Createdat { - /** - * Resource Report Rule constructor - * - */ protected function _construct() { $this->_init('salesrule/coupon_aggregated_updated', 'id'); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php index c8bcf2fd653..baa72719368 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php @@ -27,10 +27,6 @@ */ class Mage_SalesRule_Model_Resource_Rule_Customer extends Mage_Core_Model_Resource_Db_Abstract { - /** - * constructor - * - */ protected function _construct() { $this->_init('salesrule/rule_customer', 'rule_customer_id'); diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php index 1282765ecd6..d714ad70ebd 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.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_Subselect * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + * * @method $this setAttributeOption(array $value) * @method $this setOperatorOption(array $value) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php index b2a5518fda4..22db732876e 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php @@ -21,9 +21,9 @@ /** * SalesRule Rule Customer Model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team * * @method Mage_SalesRule_Model_Resource_Rule_Customer _getResource() * @method Mage_SalesRule_Model_Resource_Rule_Customer getResource() diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index eeb853ea4ff..d7441bc33e9 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.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_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) */ /** diff --git a/app/code/core/Mage/SalesRule/etc/adminhtml.xml b/app/code/core/Mage/SalesRule/etc/adminhtml.xml index 839ac58bb87..12705b1a6bc 100644 --- a/app/code/core/Mage/SalesRule/etc/adminhtml.xml +++ b/app/code/core/Mage/SalesRule/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index ac1229203a8..560936ee446 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/etc/system.xml b/app/code/core/Mage/SalesRule/etc/system.xml index c776b48c509..d285b6bc23a 100644 --- a/app/code/core/Mage/SalesRule/etc/system.xml +++ b/app/code/core/Mage/SalesRule/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php index cb8bf99d5f2..e86f9c6dd80 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.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_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) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $connection->createTable($connection->createTableByDdl( $installer->getTable('salesrule/coupon_aggregated'), diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php index b037a685870..893ea8e6bd7 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.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_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) */ -/** - * @var Mage_Core_Model_Resource_Setup $installer - */ +/** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; $installer->getConnection() diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php index f283ca9254c..2448d8a5793 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/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_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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index c6944615d95..aca077e3766 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -22,7 +22,7 @@ * Sendfriend Data Helper * * @category Mage - * @package Mage_Sedfriend + * @package Mage_Sendfriend * @author Magento Core Team */ class Mage_Sendfriend_Helper_Data extends Mage_Core_Helper_Abstract diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php index 05361fc8d0c..9d42c096749 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.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 module Setup Model * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team * @deprecated */ class Mage_Sendfriend_Model_Mysql4_Setup extends Mage_Sendfriend_Model_Resource_Setup diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php index f1f995ffa09..f540cda16b3 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php @@ -27,10 +27,6 @@ */ class Mage_Sendfriend_Model_Resource_Sendfriend extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and table - * - */ protected function _construct() { $this->_init('sendfriend/sendfriend', 'log_id'); diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php index 1807661e3e6..d048d7222e8 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.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 module Setup Model * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team */ class Mage_Sendfriend_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml index cbc9afb21e0..51a5749d49c 100644 --- a/app/code/core/Mage/Sendfriend/etc/config.xml +++ b/app/code/core/Mage/Sendfriend/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sendfriend/etc/system.xml b/app/code/core/Mage/Sendfriend/etc/system.xml index 8b80116c275..c3999b4018f 100644 --- a/app/code/core/Mage/Sendfriend/etc/system.xml +++ b/app/code/core/Mage/Sendfriend/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php index db67c44df6f..b273e4c18c4 100644 --- a/app/code/core/Mage/Shipping/Helper/Data.php +++ b/app/code/core/Mage/Shipping/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team + * @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/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index 7d65ec64cd2..a479e976d87 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -12,18 +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_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_Carrier_Tablerate + * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface { - /** * code name * @@ -52,9 +55,6 @@ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_ */ protected $_conditionNames = []; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php index 4e082687b2c..e2160aa8850 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.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_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 table rates * - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team * @deprecated */ class Mage_Shipping_Model_Mysql4_Carrier_Tablerate extends Mage_Shipping_Model_Resource_Carrier_Tablerate diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php index fa8b672c05b..4e6d1c57737 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.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) */ /** @@ -91,9 +91,6 @@ class Mage_Shipping_Model_Resource_Carrier_Tablerate extends Mage_Core_Model_Res */ protected $_conditionFullNames = []; - /** - * Define main table and id field name - */ protected function _construct() { $this->_init('shipping/tablerate', 'pk'); diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php index a63b9b53a2c..07a0c78765b 100644 --- a/app/code/core/Mage/Shipping/Model/Shipping.php +++ b/app/code/core/Mage/Shipping/Model/Shipping.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_Shipping { /** diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php index e3f3c661b32..1b1d4e0b81d 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.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) */ /** @@ -38,6 +38,10 @@ * Fields: * -carrier: usps * -tracksummary: Your item was delivered at 6:50 am on February 6 in Los Angeles CA 90064 + * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Model_Tracking_Result_Status extends Mage_Shipping_Model_Tracking_Result_Abstract { diff --git a/app/code/core/Mage/Shipping/controllers/ShippingController.php b/app/code/core/Mage/Shipping/controllers/ShippingController.php index 51f00a5b1c1..a3c6bec9d34 100644 --- a/app/code/core/Mage/Shipping/controllers/ShippingController.php +++ b/app/code/core/Mage/Shipping/controllers/ShippingController.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 * @deprecated after 1.3.2.3 - this controller is not used anywhere */ class Mage_Shipping_ShippingController extends Mage_Core_Controller_Front_Action diff --git a/app/code/core/Mage/Shipping/controllers/TrackingController.php b/app/code/core/Mage/Shipping/controllers/TrackingController.php index fe2abf00d31..f9136dd5791 100644 --- a/app/code/core/Mage/Shipping/controllers/TrackingController.php +++ b/app/code/core/Mage/Shipping/controllers/TrackingController.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,15 +23,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Shipping_TrackingController extends Mage_Core_Controller_Front_Action { - /** - * Ajax action - * - */ public function ajaxAction() { if ($order = $this->_initOrder()) { diff --git a/app/code/core/Mage/Shipping/etc/adminhtml.xml b/app/code/core/Mage/Shipping/etc/adminhtml.xml index 21876f25ea9..c2e608ad2c3 100644 --- a/app/code/core/Mage/Shipping/etc/adminhtml.xml +++ b/app/code/core/Mage/Shipping/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/config.xml b/app/code/core/Mage/Shipping/etc/config.xml index 962b98642a6..2b24356c74e 100644 --- a/app/code/core/Mage/Shipping/etc/config.xml +++ b/app/code/core/Mage/Shipping/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml index 87688afdde9..f8652afcab8 100644 --- a/app/code/core/Mage/Shipping/etc/system.xml +++ b/app/code/core/Mage/Shipping/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/Helper/Data.php b/app/code/core/Mage/Sitemap/Helper/Data.php index 5e56bd7f2ec..09fb93d556a 100644 --- a/app/code/core/Mage/Sitemap/Helper/Data.php +++ b/app/code/core/Mage/Sitemap/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @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/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php index 55359638e43..f32d31efcd2 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.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_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 resource model * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team * @deprecated */ class Mage_Sitemap_Model_Mysql4_Sitemap extends Mage_Sitemap_Model_Resource_Sitemap diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php index 6cc5299b00b..39dae57d0b5 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.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_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 resource model * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team */ class Mage_Sitemap_Model_Resource_Sitemap extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Init resource model - * - */ protected function _construct() { $this->_init('sitemap/sitemap', 'sitemap_id'); diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php index ecb04f7eca6..1f58b44d9b5 100644 --- a/app/code/core/Mage/Sitemap/Model/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Sitemap.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_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 model * + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team + * * @method Mage_Sitemap_Model_Resource_Sitemap _getResource() * @method Mage_Sitemap_Model_Resource_Sitemap getResource() * @method Mage_Sitemap_Model_Resource_Sitemap_Collection getCollection() @@ -36,10 +40,6 @@ * @method $this setSitemapTime(string $value) * @method int getStoreId() * @method $this setStoreId(int $value) - * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team */ class Mage_Sitemap_Model_Sitemap extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Sitemap/etc/adminhtml.xml b/app/code/core/Mage/Sitemap/etc/adminhtml.xml index 034801d78ca..6cb7d21dc9b 100644 --- a/app/code/core/Mage/Sitemap/etc/adminhtml.xml +++ b/app/code/core/Mage/Sitemap/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/etc/config.xml b/app/code/core/Mage/Sitemap/etc/config.xml index 7be272a93ef..7099c0cb02f 100644 --- a/app/code/core/Mage/Sitemap/etc/config.xml +++ b/app/code/core/Mage/Sitemap/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/etc/system.xml b/app/code/core/Mage/Sitemap/etc/system.xml index 3539e3d4df6..a95003c1fb5 100644 --- a/app/code/core/Mage/Sitemap/etc/system.xml +++ b/app/code/core/Mage/Sitemap/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php index ee3e4e77ade..92f984b468b 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Tags.php +++ b/app/code/core/Mage/Tag/Block/Customer/Tags.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_Block_Customer_Tags extends Mage_Customer_Block_Account_Dashboard { protected $_tags; diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php index 3c7c62e6ac2..4b7ac8d8395 100644 --- a/app/code/core/Mage/Tag/Block/Customer/View.php +++ b/app/code/core/Mage/Tag/Block/Customer/View.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) */ /** diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index 38e269cf85c..597af40072b 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @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/Model/Api/V2.php b/app/code/core/Mage/Tag/Model/Api/V2.php index 91f48f061e6..83f78b79fd4 100644 --- a/app/code/core/Mage/Tag/Model/Api/V2.php +++ b/app/code/core/Mage/Tag/Model/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Tag/Model/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Indexer/Summary.php index c281e3a08cb..648e9b3683a 100644 --- a/app/code/core/Mage/Tag/Model/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Indexer/Summary.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_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 Indexer Model * + * @category Mage + * @package Mage_Tag + * @author Magento Core Team + * * @method Mage_Tag_Model_Resource_Indexer_Summary _getResource() * @method Mage_Tag_Model_Resource_Indexer_Summary getResource() * @method int getTagId() @@ -39,10 +43,6 @@ * @method Mage_Tag_Model_Indexer_Summary setPopularity(int $value) * @method int getBasePopularity() * @method Mage_Tag_Model_Indexer_Summary setBasePopularity(int $value) - * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team */ class Mage_Tag_Model_Indexer_Summary extends Mage_Index_Model_Indexer_Abstract { @@ -63,10 +63,6 @@ class Mage_Tag_Model_Indexer_Summary extends Mage_Index_Model_Indexer_Abstract ] ]; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('tag/indexer_summary'); diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php index 9d979ecba23..58f231d151d 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.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_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 Indexer Model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team * @deprecated */ class Mage_Tag_Model_Mysql4_Indexer_Summary extends Mage_Tag_Model_Resource_Indexer_Summary diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php index 226a0c9b9d1..767fa312178 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag.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_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 resource model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team * @deprecated */ class Mage_Tag_Model_Mysql4_Tag extends Mage_Tag_Model_Resource_Tag diff --git a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php index 69b945759d3..55a85878a10 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.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_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 Indexer Model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team */ class Mage_Tag_Model_Resource_Indexer_Summary extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('tag/summary', 'tag_id'); diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php index 3d57eded6d7..7c8a9cfd852 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag.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_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 resource model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team */ class Mage_Tag_Model_Resource_Tag extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and primary index - * - */ protected function _construct() { $this->_init('tag/tag', 'tag_id'); diff --git a/app/code/core/Mage/Tag/Model/Session.php b/app/code/core/Mage/Tag/Model/Session.php index 107c059766f..29e8fd6f83b 100644 --- a/app/code/core/Mage/Tag/Model/Session.php +++ b/app/code/core/Mage/Tag/Model/Session.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,7 +23,7 @@ * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Tag_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php index 6e0740c9073..731bf85af8a 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.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_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 model * + * @category Mage + * @package Mage_Tag + * @author Magento Core Team + * * @method Mage_Tag_Model_Resource_Tag _getResource() * @method Mage_Tag_Model_Resource_Tag getResource() * @method Mage_Tag_Model_Resource_Tag_Collection getCollection() @@ -44,12 +48,7 @@ * @method $this setStoreId(int $value) * @method array getVisibleInStoreIds() * @method $this setVisibleInStoreIds(array $value) - * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team */ - class Mage_Tag_Model_Tag extends Mage_Core_Model_Abstract { const STATUS_DISABLED = -1; diff --git a/app/code/core/Mage/Tag/etc/adminhtml.xml b/app/code/core/Mage/Tag/etc/adminhtml.xml index be1ee8522c0..de301b9c4be 100644 --- a/app/code/core/Mage/Tag/etc/adminhtml.xml +++ b/app/code/core/Mage/Tag/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/etc/api.xml b/app/code/core/Mage/Tag/etc/api.xml index 0d5fc9286d4..286dadd0a6f 100644 --- a/app/code/core/Mage/Tag/etc/api.xml +++ b/app/code/core/Mage/Tag/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml index c2e96b4d1bc..256d0e54d0a 100644 --- a/app/code/core/Mage/Tag/etc/config.xml +++ b/app/code/core/Mage/Tag/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php index e7f5aa48684..ba5365a365a 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.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_Block_Adminhtml_Frontend_Region_Updater extends Mage_Adminhtml_Block_System_Config_Form_Field { /** diff --git a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php b/app/code/core/Mage/Tax/Block/Checkout/Shipping.php index 994ad6ba6b1..32dbdd9ab53 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Shipping.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_Shipping extends Mage_Checkout_Block_Total_Default { protected $_template = 'tax/checkout/shipping.phtml'; diff --git a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php index b01b2b27eb9..37af6ae9847 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.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_Subtotal extends Mage_Checkout_Block_Total_Default { /** diff --git a/app/code/core/Mage/Tax/Block/Checkout/Tax.php b/app/code/core/Mage/Tax/Block/Checkout/Tax.php index 15cf1357b29..f0cdc54af11 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Tax.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Tax.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_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) */ /** diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php index 3eb62c64f04..8213a490b05 100644 --- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.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_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) */ /** diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php index 35ad0d95b8f..0a5ac4010a0 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @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/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php index 338379be014..2fed85c7f21 100644 --- a/app/code/core/Mage/Tax/Model/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Calculation.php @@ -126,9 +126,6 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract */ protected $_taxHelper; - /** - * Constructor - */ protected function _construct() { $this->_init('tax/calculation'); diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php index 02211a45ec5..84f4c1ecb3e 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.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_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 Rate Title Model * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team + * * @method Mage_Tax_Model_Resource_Calculation_Rate_Title _getResource() * @method Mage_Tax_Model_Resource_Calculation_Rate_Title getResource() * @method Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection getCollection() @@ -31,10 +35,6 @@ * @method $this setStoreId(int $value) * @method string getValue() * @method $this setValue(string $value) - * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team */ class Mage_Tax_Model_Calculation_Rate_Title extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php index 86afd420b23..449ed3513e0 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php @@ -21,9 +21,9 @@ /** * Class Mage_Tax_Model_Class_Source_Customer * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Class_Source_Customer extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php index 96e49b049ae..d09fa5f15b9 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.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_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 Rate Title Collection * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Calculation_Rate_Title extends Mage_Tax_Model_Resource_Calculation_Rate_Title diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php index e09e799abc4..848d437ed18 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.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_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 + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Report_Tax extends Mage_Tax_Model_Resource_Report_Tax diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php index 507fd46f96d..2167a100ea7 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.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_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 + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Sales_Order_Tax extends Mage_Tax_Model_Resource_Sales_Order_Tax diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php index 018219f8828..e4c0a4ac722 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Setup.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_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 Setup Resource Model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Setup extends Mage_Tax_Model_Resource_Setup diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php index 53076c96087..90b68e8f3e3 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.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_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 Rate Title Collection * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Calculation_Rate_Title extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_calculation_rate_title', 'tax_calculation_rate_title_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php index b4e29e2e256..b30b23fdb5c 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.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_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 report resource model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Report_Tax extends Mage_Reports_Model_Resource_Report_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_order_aggregated_created', 'id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php index edbb5052eb2..49754c2d8cb 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.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_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 report resource model with aggregation by updated at * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Report_Tax_Updatedat extends Mage_Tax_Model_Resource_Report_Tax_Createdat { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_order_aggregated_updated', 'id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php index cc81c4c6b09..8c975ffc0df 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.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_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) */ /** * Sales order tax resource model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Sales_Order_Tax extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/sales_order_tax', 'tax_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Setup.php b/app/code/core/Mage/Tax/Model/Resource/Setup.php index 8a1473881b5..dc7e3c6d355 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Setup.php +++ b/app/code/core/Mage/Tax/Model/Resource/Setup.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_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 Setup Resource Model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php index 8efcaaceb11..bfa3ed2db97 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.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 + * * @method Mage_Tax_Model_Resource_Sales_Order_Tax _getResource() * @method Mage_Tax_Model_Resource_Sales_Order_Tax getResource() * @method Mage_Tax_Model_Resource_Sales_Order_Tax_Collection getCollection() @@ -45,10 +49,6 @@ * @method $this setBaseRealAmount(float $value) * @method int getHidden() * @method $this setHidden(int $value) - * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team */ class Mage_Tax_Model_Sales_Order_Tax extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php index fdff9b39adb..0fbc5ee689f 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.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) */ /** - * Class Mage_Tax_Model_Sales_Pdf_Shipping + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Pdf_Shipping extends Mage_Sales_Model_Order_Pdf_Total_Default { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php index 4e8068ac715..1abad29143f 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.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) */ /** * Class Mage_Tax_Model_Sales_Pdf_Subtotal + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Pdf_Subtotal extends Mage_Sales_Model_Order_Pdf_Total_Default { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php index 391eb84aca5..144f1f7c612 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.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_Tax extends Mage_Sales_Model_Order_Pdf_Total_Default { /** diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php index 18b4ba832aa..d16a05440a5 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.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) */ /** * Nominal subtotal tax total + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Nominal_Subtotal extends Mage_Tax_Model_Sales_Total_Quote_Subtotal { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php index a067bdbad3b..a77dab6ff83 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.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) */ /** * Nominal tax total + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Nominal_Tax extends Mage_Tax_Model_Sales_Total_Quote_Tax { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php index fa5a9fe0604..44cffa248ba 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.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_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) */ /** * Model to calculate shipping tax * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Shipping extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php index 98ee2d094bd..df4c5e662ed 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.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) */ /** * Calculate items and address amounts including/excluding tax + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Subtotal extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php index 55af2928a4b..b9bed02ed28 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.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 totals calculation model + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Tax extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php index 0acf43db912..d46a664ff5b 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.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_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) */ /** * Price display type source model * - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_System_Config_Source_Tax_Display_Type { diff --git a/app/code/core/Mage/Tax/etc/adminhtml.xml b/app/code/core/Mage/Tax/etc/adminhtml.xml index d2c45f24761..b084c5cbe09 100644 --- a/app/code/core/Mage/Tax/etc/adminhtml.xml +++ b/app/code/core/Mage/Tax/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index 0c9b0a0d779..bcdef0d3858 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/system.xml b/app/code/core/Mage/Tax/etc/system.xml index dd318f38872..e867a5791cb 100644 --- a/app/code/core/Mage/Tax/etc/system.xml +++ b/app/code/core/Mage/Tax/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php index 7ffca868e6a..ab41d8ee4ef 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.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_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) */ -$installer = $this; /** @var Mage_Tax_Model_Resource_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $connection->createTable($connection->createTableByDdl( $installer->getTable('tax/tax_order_aggregated_created'), diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php index e261c43d54a..47fc36a93a3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.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_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 */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php index e240a7992d3..ea3621014c4 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.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_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) */ -$installer = $this; /** @var Mage_Tax_Model_Resource_Setup $installer */ +$installer = $this; /** * Add new field to 'tax/sales_order_tax_item' diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php index 8c350e10435..70861ccedcd 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.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_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 $this */ diff --git a/app/code/core/Mage/Uploader/Block/Single.php b/app/code/core/Mage/Uploader/Block/Single.php index e5879c70cd9..36188d7075c 100644 --- a/app/code/core/Mage/Uploader/Block/Single.php +++ b/app/code/core/Mage/Uploader/Block/Single.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_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) */ +/** + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team + */ class Mage_Uploader_Block_Single extends Mage_Uploader_Block_Abstract { /** @@ -33,9 +38,6 @@ protected function _prepareLayout() return $this; } - /** - * Constructor for single uploader block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Uploader/Helper/Data.php b/app/code/core/Mage/Uploader/Helper/Data.php index a045d4dfade..e3b964e31a1 100644 --- a/app/code/core/Mage/Uploader/Helper/Data.php +++ b/app/code/core/Mage/Uploader/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Uploader - * @author Magento Core Team + * @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/Model/Config/Uploader.php b/app/code/core/Mage/Uploader/Model/Config/Uploader.php index ecd0fa57a6b..54618e78f37 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Uploader.php +++ b/app/code/core/Mage/Uploader/Model/Config/Uploader.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_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 Config Instance Abstract Model * - * @category Mage - * @package Mage_Uploader - */ - -/** + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team + * * @method Mage_Uploader_Model_Config_Uploader setTarget(string $url) * The target URL for the multipart POST request. * @method Mage_Uploader_Model_Config_Uploader setSingleFile(bool $isSingleFile) @@ -73,8 +72,6 @@ * Response is success if response status is in this list * @method Mage_Uploader_Model_Config_Uploader setPermanentErrors(array $permanentErrors) * Response fails if response status is in this list - * - * Class Mage_Uploader_Model_Config_Uploader */ class Mage_Uploader_Model_Config_Uploader extends Mage_Uploader_Model_Config_Abstract { diff --git a/app/code/core/Mage/Uploader/etc/config.xml b/app/code/core/Mage/Uploader/etc/config.xml index e975be25bd5..7d7863bb805 100644 --- a/app/code/core/Mage/Uploader/etc/config.xml +++ b/app/code/core/Mage/Uploader/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Uploader/etc/jstranslator.xml b/app/code/core/Mage/Uploader/etc/jstranslator.xml index 3229725251e..4ff42895612 100644 --- a/app/code/core/Mage/Uploader/etc/jstranslator.xml +++ b/app/code/core/Mage/Uploader/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php index 6fa819a4c27..ab5b92cf614 100644 --- a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.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) */ /** @@ -27,10 +27,6 @@ */ class Mage_Usa_Block_Adminhtml_Dhl_Unitofmeasure extends Mage_Adminhtml_Block_System_Config_Form_Field { - - /** - * Define params and variables - */ public function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php index 224d797f653..efcd138dba0 100644 --- a/app/code/core/Mage/Usa/Helper/Data.php +++ b/app/code/core/Mage/Usa/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Usa - * @author Magento Core Team + * @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/Dhl/International/Source/Method/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php index b54746333d0..486f6897710 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.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/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php index bcc7d7805bb..87def85c457 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.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/Protection/Value.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php index 50022e5ae41..a4868c71173 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.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_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) */ - class Mage_Usa_Model_Shipping_Carrier_Dhl_Source_Protection_Value { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php index 2b8bcb16cbb..c266df5b572 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.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_Shipmenttype { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php index 571aef27e4b..e1c9d677c8c 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.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.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php index cadeec68e7e..367f369a76f 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.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_Ups 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/Ups/Backend/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php index 485f257b6ea..c41dc46be58 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.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_Type extends Mage_Usa_Model_Shipping_Carrier_Abstract_Backend_Abstract { /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php index 27df617a4c9..a3ed9ed0df6 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.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_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 Ups type action Dropdown source * - * @author Magento Core Team + * @category Mage + * @package Mage_Usa + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Type { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php index 6a757f87455..79b38ca24cf 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.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_Unitofmeasure { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php index 0dc07c3dc5c..7eac712a749 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.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) */ /** @@ -24,7 +24,7 @@ * @link http://www.usps.com/webtools/htm/Development-Guide-v3-0b.htm * @category Mage * @package Mage_Usa - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Usps extends Mage_Usa_Model_Shipping_Carrier_Abstract diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php index bc915d05389..887e7353d58 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.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_Size { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml index 8f0090ee5af..ad5e0fb8243 100644 --- a/app/code/core/Mage/Usa/etc/config.xml +++ b/app/code/core/Mage/Usa/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml b/app/code/core/Mage/Usa/etc/dhl/international/countries.xml index 794e3f842ca..04a3c4929c2 100644 --- a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml +++ b/app/code/core/Mage/Usa/etc/dhl/international/countries.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 9982521b8b0..be0a53e64dc 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php index 94b5e2c92e6..ee326e623e1 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/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_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) */ $codes = [ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php index d43e6e68c21..085df3d48d1 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -12,14 +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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; + $configDataTable = $installer->getTable('core/config_data'); $connection = $installer->getConnection(); diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php index 17b446b9d5d..72180307fd4 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/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_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) */ /** @var Mage_Core_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php index f57c4645b39..ca2a12c612b 100644 --- a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.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_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_Block_Element_Weee_Tax extends Varien_Data_Form_Element_Abstract { } diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php index f00e9541ef6..f5eb35c7570 100644 --- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.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_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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Weee_Block_Renderer_Weee_Tax extends Mage_Adminhtml_Block_Widget implements Varien_Data_Form_Element_Renderer_Interface { diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php index d2efdbc45da..ac8fd28e129 100644 --- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.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_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) */ - class Mage_Weee_Model_Attribute_Backend_Weee_Tax extends Mage_Catalog_Model_Product_Attribute_Backend_Price { /** @@ -27,6 +26,7 @@ public static function getBackendModelName() { return 'weee/attribute_backend_weee_tax'; } + /** * Retrieve resource model * diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php b/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php index 232d21ed63b..da2784a4196 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.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_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_Fpt_Tax { diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php index 223b0c4831c..9f578052864 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.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_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) */ /** * Catalog product WEEE tax backend attribute model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team * @deprecated */ class Mage_Weee_Model_Mysql4_Attribute_Backend_Weee_Tax extends Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php index 9c585cf6473..fe8660d152f 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Setup.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_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 tax setup * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team * @deprecated */ class Mage_Weee_Model_Mysql4_Setup extends Mage_Weee_Model_Resource_Setup diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php index 9bb1fb4d8d3..b8cca50946f 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Tax.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_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 + * @category Mage + * @package Mage_Weee + * @author Magento Core Team * @deprecated */ class Mage_Weee_Model_Mysql4_Tax extends Mage_Weee_Model_Resource_Tax diff --git a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php index 6f6b5e51499..5c1229e8d03 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.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_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) */ /** * Catalog product WEEE tax backend attribute model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Weee/Model/Resource/Setup.php b/app/code/core/Mage/Weee/Model/Resource/Setup.php index 9d1df65bae8..a50c9e5e022 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Setup.php +++ b/app/code/core/Mage/Weee/Model/Resource/Setup.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_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 tax setup * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/Weee/Model/Resource/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Tax.php index 5efc08cdc83..73fad4a9781 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Tax.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_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) */ /** * Wee tax resource model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Resource_Tax extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('weee/tax', 'value_id'); diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php index 0c4f6834d7e..623608a5a08 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.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_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) */ /** * Model to calculate Weee amount * + * @category Mage + * @package Mage_Weee + * @author Magento Core Team + * * @method Mage_Weee_Model_Resource_Tax _getResource() * @method Mage_Weee_Model_Resource_Tax getResource() */ diff --git a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php index 8a74fd94ee4..1adbbc2dbff 100644 --- a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.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_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_Total_Creditmemo_Weee extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** diff --git a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php index cd561108c0a..eb9730546d1 100644 --- a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.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_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_Total_Invoice_Weee extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php index 8a28b330f1e..30515b4fd97 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.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_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) */ /** * Nominal fixed product tax total + * + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Total_Quote_Nominal_Weee extends Mage_Weee_Model_Total_Quote_Weee { diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index 450e20c2e48..f7d2f807055 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.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_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 calculation model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Total_Quote_Weee extends Mage_Tax_Model_Sales_Total_Quote_Tax { diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml index 2560f2f07e8..3292e7abf46 100644 --- a/app/code/core/Mage/Weee/etc/config.xml +++ b/app/code/core/Mage/Weee/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Weee/etc/system.xml b/app/code/core/Mage/Weee/etc/system.xml index 1976fe0a184..e7e674fdaea 100644 --- a/app/code/core/Mage/Weee/etc/system.xml +++ b/app/code/core/Mage/Weee/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php index ba410949631..0aeb841065a 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.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) */ /** diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php index cc5bbb17089..9f2b540d847 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.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 template chooser * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * * @method string getSelected() * @method $this setSelected(string $value) diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php index 670014bf039..8d71b6bbb89 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.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 Settings tab 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_Edit_Tab_Settings extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface { diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php index 5f650fd23f2..fcc9cfa242d 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.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 tabs 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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php index ced995c930d..3d14b278bb7 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget.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) */ /** * Preconfigured widget * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * @deprecated */ class Mage_Widget_Model_Mysql4_Widget extends Mage_Widget_Model_Resource_Widget diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget.php b/app/code/core/Mage/Widget/Model/Resource/Widget.php index 14ffa3e170a..4aed5488b35 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget.php @@ -12,26 +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) */ /** * Preconfigured widget * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Model_Resource_Widget extends Mage_Core_Model_Resource_Db_Abstract { - - /** - * Define main table - * - */ protected function _construct() { $this->_init('widget/widget', 'widget_id'); diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php index ef7c09111ba..ab68b556cae 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php @@ -27,10 +27,6 @@ */ class Mage_Widget_Model_Resource_Widget_Instance extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('widget/widget_instance', 'instance_id'); diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php index 51eb918d211..0da235c1bc3 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php @@ -34,10 +34,6 @@ class Mage_Widget_Model_Resource_Widget_Instance_Collection extends Mage_Core_Mo */ protected $_map = ['fields' => ['type' => 'instance_type']]; - /** - * Constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php index 9147290f6b1..cf69f000d64 100644 --- a/app/code/core/Mage/Widget/Model/Widget.php +++ b/app/code/core/Mage/Widget/Model/Widget.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 model for different purposes * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Model_Widget extends Varien_Object { diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php index 2c2dd9ee479..874df5464bd 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.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) */ /** * Widgets management controller * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Adminhtml_WidgetController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Widget/etc/adminhtml.xml b/app/code/core/Mage/Widget/etc/adminhtml.xml index 5ef32b8e271..3a15e01cb54 100644 --- a/app/code/core/Mage/Widget/etc/adminhtml.xml +++ b/app/code/core/Mage/Widget/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/etc/config.xml b/app/code/core/Mage/Widget/etc/config.xml index 513fd713f8f..b032bde7cb3 100644 --- a/app/code/core/Mage/Widget/etc/config.xml +++ b/app/code/core/Mage/Widget/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/etc/jstranslator.xml b/app/code/core/Mage/Widget/etc/jstranslator.xml index 0dc4aa1f469..abdb7e5cb19 100644 --- a/app/code/core/Mage/Widget/etc/jstranslator.xml +++ b/app/code/core/Mage/Widget/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php index e6b0a718301..40a65e10c2e 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php index 77d72329c43..d29feae7b51 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 12828783e2f..121b16ac734 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php index 7a196225240..7a22ad1f4dd 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php index 9bd2a172b94..6ec4a1aa2f5 100644 --- a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php +++ b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.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_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) + */ + +/** + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Model_Config_Source_Summary { diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php index 8ea6b394191..90691ead7c7 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.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 model resource * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team * @deprecated */ class Mage_Wishlist_Model_Mysql4_Wishlist extends Mage_Wishlist_Model_Resource_Wishlist diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item.php b/app/code/core/Mage/Wishlist/Model/Resource/Item.php index a8c3b23bae3..ceb58595197 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item.php @@ -27,10 +27,6 @@ */ class Mage_Wishlist_Model_Resource_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('wishlist/item', 'wishlist_item_id'); diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php index 29f03b67ad4..4b7945ba4ee 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.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 resource model * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Model_Resource_Wishlist extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Wishlist/Model/Session.php b/app/code/core/Mage/Wishlist/Model/Session.php index 11389a654ad..c5d2a1a8901 100644 --- a/app/code/core/Mage/Wishlist/Model/Session.php +++ b/app/code/core/Mage/Wishlist/Model/Session.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php index 2825098fb43..99399c71240 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.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_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 model * + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team + * * @method Mage_Wishlist_Model_Resource_Wishlist _getResource() * @method Mage_Wishlist_Model_Resource_Wishlist getResource() * @method Mage_Wishlist_Model_Resource_Wishlist_Collection getCollection() @@ -32,10 +36,6 @@ * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) * @method string getVisibility() - * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team */ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php index 5f3d4e9df81..02e1bb862f5 100644 --- a/app/code/core/Mage/Wishlist/controllers/SharedController.php +++ b/app/code/core/Mage/Wishlist/controllers/SharedController.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 shared items controllers * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_SharedController extends Mage_Wishlist_Controller_Abstract { diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml index a41026ee9e9..0d75cbbfc2c 100644 --- a/app/code/core/Mage/Wishlist/etc/config.xml +++ b/app/code/core/Mage/Wishlist/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/etc/system.xml b/app/code/core/Mage/Wishlist/etc/system.xml index 1eb4813fdb4..0ba54b28265 100644 --- a/app/code/core/Mage/Wishlist/etc/system.xml +++ b/app/code/core/Mage/Wishlist/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Zend/Db/Select.php b/app/code/core/Zend/Db/Select.php index 0afb780046a..1ed07515547 100644 --- a/app/code/core/Zend/Db/Select.php +++ b/app/code/core/Zend/Db/Select.php @@ -39,7 +39,6 @@ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ - class Zend_Db_Select { const DISTINCT = 'distinct'; diff --git a/app/code/core/Zend/Db/Statement.php b/app/code/core/Zend/Db/Statement.php index 4582ac22da2..d232ec72112 100644 --- a/app/code/core/Zend/Db/Statement.php +++ b/app/code/core/Zend/Db/Statement.php @@ -41,7 +41,6 @@ */ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface { - /** * @var resource|object The driver level statement object/resource */ diff --git a/app/code/core/Zend/Mime.php b/app/code/core/Zend/Mime.php index e070aaa84f0..c8996e25c9b 100644 --- a/app/code/core/Zend/Mime.php +++ b/app/code/core/Zend/Mime.php @@ -287,8 +287,6 @@ public static function encodeBase64($str, } /** - * Constructor - * * @param null|string $boundary * @access public * @return void From 9544400995abf9b8cba7ba103137c7a40d961b29 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 6 Sep 2022 22:44:23 +0100 Subject: [PATCH 2/2] Fixed whitespace for docblocks --- app/code/core/Mage/Admin/Helper/Block.php | 3 --- app/code/core/Mage/Admin/Helper/Variable.php | 5 +---- .../core/Mage/Admin/Model/Acl/Assert/Time.php | 2 +- .../core/Mage/Admin/Model/Acl/Role/User.php | 2 +- .../core/Mage/Admin/Model/Mysql4/User.php | 2 +- .../core/Mage/Admin/Model/Resource/Block.php | 3 --- .../core/Mage/Admin/Model/Resource/Roles.php | 4 ---- .../core/Mage/Admin/Model/Resource/User.php | 8 +------ .../Mage/Admin/Model/Resource/Variable.php | 11 +--------- app/code/core/Mage/Admin/Model/User.php | 2 +- app/code/core/Mage/Admin/Model/Variable.php | 6 ++++- app/code/core/Mage/Admin/etc/config.xml | 2 +- .../admin_setup/upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../admin_setup/upgrade-1.6.1.0-1.6.1.1.php | 2 +- .../admin_setup/upgrade-1.6.1.1-1.6.1.2.php | 2 +- .../admin_setup/upgrade-1.6.1.2-1.6.1.3.php | 2 +- .../Mage/AdminNotification/etc/adminhtml.xml | 2 +- .../Mage/AdminNotification/etc/config.xml | 2 +- .../Mage/AdminNotification/etc/system.xml | 10 ++++----- .../Adminhtml/Block/Api/Role/Grid/User.php | 5 +---- .../Adminhtml/Block/Api/Tab/Userroles.php | 10 ++++++--- .../core/Mage/Adminhtml/Block/Api/User.php | 3 +-- .../Block/Api/User/Edit/Tab/Roles.php | 6 ++--- .../Adminhtml/Block/Api/User/Edit/Tabs.php | 2 +- .../core/Mage/Adminhtml/Block/Api/Users.php | 4 +--- .../Catalog/Category/Checkboxes/Tree.php | 4 +++- .../Adminhtml/Block/Catalog/Category/Tabs.php | 2 +- .../Adminhtml/Block/Catalog/Category/Tree.php | 3 +-- .../Form/Renderer/Attribute/Urlkey.php | 3 +-- .../Form/Renderer/Config/YearRange.php | 3 +-- .../Block/Catalog/Helper/Form/Wysiwyg.php | 2 +- .../Product/Attribute/Edit/Tab/System.php | 5 +---- .../Catalog/Product/Attribute/Edit/Tabs.php | 4 +--- .../Product/Attribute/Set/Toolbar/Add.php | 2 -- .../Edit/Action/Attribute/Tab/Websites.php | 2 +- .../Product/Edit/Action/Attribute/Tabs.php | 2 +- .../Catalog/Product/Edit/Tab/Alerts/Stock.php | 2 +- .../Product/Edit/Tab/Options/Type/Text.php | 3 +-- .../Catalog/Product/Edit/Tab/Price/Tier.php | 6 +---- .../Catalog/Product/Edit/Tab/Settings.php | 2 +- .../Product/Edit/Tab/Super/Config/Simple.php | 2 +- .../Product/Edit/Tab/Super/Settings.php | 3 +-- .../Block/Catalog/Product/Edit/Tab/Tag.php | 3 +-- .../Block/Catalog/Product/Edit/Tab/Upsell.php | 3 +-- .../Catalog/Product/Edit/Tab/Websites.php | 5 +---- .../Block/Catalog/Product/Edit/Tabs.php | 2 +- .../Product/Frontend/Product/Watermark.php | 2 +- .../Catalog/Product/Helper/Form/Weight.php | 2 +- .../Adminhtml/Block/Cms/Page/Edit/Tabs.php | 3 +-- .../Block/Cms/Wysiwyg/Images/Content.php | 2 -- .../Cms/Wysiwyg/Images/Content/Uploader.php | 5 +---- .../Block/Cms/Wysiwyg/Images/Tree.php | 3 +-- .../Block/Customer/Edit/Renderer/Region.php | 2 -- .../Tab/Newsletter/Grid/Filter/Status.php | 4 +--- .../Tab/Newsletter/Grid/Renderer/Status.php | 4 +--- .../Adminhtml/Block/Customer/Edit/Tab/Tag.php | 3 +-- .../Block/Customer/Edit/Tab/Tags.php | 3 +-- .../Block/Customer/Edit/Tab/View.php | 3 +-- .../Block/Customer/Edit/Tab/View/Wishlist.php | 5 +---- .../Block/Customer/Edit/Tab/Wishlist.php | 2 +- .../Adminhtml/Block/Customer/Edit/Tabs.php | 3 +-- .../Customer/Online/Grid/Renderer/Type.php | 4 +--- .../Customer/Online/Grid/Renderer/Url.php | 2 +- .../Sales/Order/Address/Form/Renderer/Vat.php | 2 +- .../Customer/System/Config/Validatevat.php | 2 +- .../core/Mage/Adminhtml/Block/Dashboard.php | 6 ++--- .../Block/Dashboard/Searches/Top.php | 3 +-- .../Block/Dashboard/Tab/Products/Viewed.php | 4 +--- .../Mage/Adminhtml/Block/Dashboard/Totals.php | 2 +- .../Mage/Adminhtml/Block/Media/Uploader.php | 9 +------- .../Adminhtml/Block/Newsletter/Subscriber.php | 10 +-------- .../Subscriber/Grid/Filter/Website.php | 4 +--- .../Adminhtml/Block/Newsletter/Template.php | 3 +-- .../Notification/Grid/Renderer/Severity.php | 2 +- .../Adminhtml/Block/Notification/Toolbar.php | 5 +++-- .../Adminhtml/Block/Notification/Window.php | 7 +++++- .../Adminhtml/Block/Permissions/Block.php | 3 --- .../Block/Permissions/Block/Edit.php | 3 --- .../Block/Permissions/Block/Grid.php | 3 --- .../Adminhtml/Block/Permissions/Grid/User.php | 4 +--- .../Block/Permissions/Role/Grid/User.php | 4 +--- .../Block/Permissions/Tab/Useredit.php | 10 ++++++--- .../Block/Permissions/Tab/Userroles.php | 10 ++++++--- .../Mage/Adminhtml/Block/Permissions/User.php | 5 +---- .../Block/Permissions/User/Edit/Tabs.php | 3 +-- .../Block/Permissions/Usernroles.php | 13 +++++++---- .../Adminhtml/Block/Permissions/Users.php | 4 +--- .../Adminhtml/Block/Permissions/Variable.php | 5 +---- .../Block/Permissions/Variable/Edit.php | 3 --- .../Mage/Adminhtml/Block/Poll/Edit/Tabs.php | 3 +-- .../Block/Promo/Catalog/Edit/Form.php | 2 -- .../Promo/Catalog/Edit/Tab/Conditions.php | 2 -- .../Block/Promo/Catalog/Edit/Tabs.php | 6 +---- .../Adminhtml/Block/Promo/Quote/Edit/Form.php | 2 -- .../Block/Promo/Quote/Edit/Tab/Conditions.php | 2 -- .../Tab/Coupons/Grid/Column/Renderer/Used.php | 2 +- .../Adminhtml/Block/Promo/Quote/Edit/Tabs.php | 6 +---- .../Block/Promo/Widget/Chooser/Sku.php | 2 +- .../Mage/Adminhtml/Block/Rating/Edit/Tabs.php | 12 ++-------- .../core/Mage/Adminhtml/Block/Rating/Grid.php | 2 -- .../Report/Config/Form/Field/YtdStart.php | 3 +-- .../Block/Report/Customer/Totals.php | 3 +-- .../Adminhtml/Block/Report/Grid/Shopcart.php | 2 +- .../Adminhtml/Block/Report/Product/Sold.php | 3 +-- .../Adminhtml/Block/Report/Product/Viewed.php | 3 +-- .../Block/Report/Refresh/Statistics.php | 3 +-- .../Adminhtml/Block/Report/Sales/Shipping.php | 3 +-- .../Mage/Adminhtml/Block/Report/Sales/Tax.php | 3 +-- .../Mage/Adminhtml/Block/Report/Wishlist.php | 4 +--- .../Block/Review/Grid/Filter/Type.php | 3 +-- .../Block/Review/Grid/Renderer/Type.php | 3 +-- .../Adminhtml/Block/Review/Rating/Summary.php | 3 +-- .../Block/Sales/Order/Comments/View.php | 2 +- .../Block/Sales/Order/Create/Sidebar.php | 3 +-- .../Sales/Order/Create/Sidebar/Viewed.php | 4 +--- .../Sales/Order/Create/Sidebar/Wishlist.php | 2 +- .../Block/Sales/Order/Create/Store.php | 4 +--- .../Block/Sales/Order/Create/Totals.php | 3 +-- .../Sales/Order/Create/Totals/Shipping.php | 7 +++--- .../Sales/Order/Create/Totals/Subtotal.php | 6 +++-- .../Block/Sales/Order/Create/Totals/Table.php | 5 +---- .../Block/Sales/Order/Create/Totals/Tax.php | 6 +++-- .../Block/Sales/Order/Creditmemo/Totals.php | 2 +- .../Block/Sales/Order/Creditmemo/View.php | 2 +- .../Sales/Order/Invoice/Create/Tracking.php | 2 +- .../Block/Sales/Order/Invoice/Totals.php | 2 +- .../Block/Sales/Order/Invoice/View.php | 2 +- .../Sales/Order/Shipment/Create/Tracking.php | 2 +- .../Block/Sales/Order/Shipment/View.php | 2 +- .../Sales/Order/Shipment/View/Tracking.php | 2 +- .../Adminhtml/Block/Sales/Order/Status.php | 2 +- .../Adminhtml/Block/Sales/Order/Totalbar.php | 3 +-- .../Adminhtml/Block/Sales/Order/Totals.php | 2 +- .../Block/Sales/Order/Totals/Tax.php | 2 +- .../Mage/Adminhtml/Block/Sales/Order/View.php | 2 +- .../Block/Sales/Order/View/Tab/Shipments.php | 2 +- .../Sales/Order/View/Tab/Transactions.php | 2 +- .../Adminhtml/Block/Sales/Order/View/Tabs.php | 2 +- .../Mage/Adminhtml/Block/Sales/Shipment.php | 4 +--- .../Mage/Adminhtml/Block/Sales/Totals.php | 7 +++++- .../Adminhtml/Block/Sales/Transactions.php | 2 +- .../core/Mage/Adminhtml/Block/Sitemap.php | 5 ++--- .../Block/Sitemap/Grid/Renderer/Time.php | 3 ++- .../Mage/Adminhtml/Block/Store/Switcher.php | 2 +- .../Config/Form/Fieldset/Order/Statuses.php | 8 +++++-- .../Block/System/Config/Switcher.php | 7 +++++- .../System/Storage/Media/Synchronize.php | 2 +- .../Adminhtml/Block/System/Config/Tabs.php | 4 +--- .../System/Convert/Gui/Edit/Tab/Upload.php | 3 +-- .../System/Convert/Gui/Edit/Tab/View.php | 2 +- .../System/Convert/Gui/Edit/Tab/Wizard.php | 4 +--- .../Block/System/Convert/Gui/Edit/Tabs.php | 5 +---- .../System/Convert/Profile/Edit/Tabs.php | 5 +---- .../Block/System/Currency/Edit/Tabs.php | 2 +- .../Block/System/Design/Edit/Tabs.php | 7 +++++- .../Adminhtml/Block/System/Email/Template.php | 4 +--- .../Email/Template/Grid/Filter/Type.php | 3 +-- .../Email/Template/Grid/Renderer/Type.php | 3 +-- .../Block/System/Store/Delete/Website.php | 4 +--- .../Block/System/Store/Grid/Render/Store.php | 3 +-- .../System/Store/Grid/Render/Website.php | 5 +---- .../Adminhtml/Block/System/Store/Store.php | 3 +-- .../Adminhtml/Block/System/Store/Tree.php | 2 +- .../Mage/Adminhtml/Block/System/Variable.php | 6 +---- app/code/core/Mage/Adminhtml/Block/Tag.php | 2 +- .../Adminhtml/Block/Tag/Store/Switcher.php | 2 +- .../core/Mage/Adminhtml/Block/Tag/Tag.php | 4 +--- .../Mage/Adminhtml/Block/Tax/Rate/Title.php | 6 +++-- .../core/Mage/Adminhtml/Block/Template.php | 2 +- .../core/Mage/Adminhtml/Block/Urlrewrite.php | 2 +- .../Block/Urlrewrite/Category/Tree.php | 2 +- app/code/core/Mage/Adminhtml/Block/Widget.php | 2 +- .../Block/Widget/Grid/Column/Filter/Store.php | 4 +--- .../Block/Widget/Grid/Column/Filter/Text.php | 2 +- .../Block/Widget/Grid/Column/Filter/Theme.php | 2 +- .../Widget/Grid/Column/Renderer/Store.php | 2 +- .../Widget/Grid/Column/Renderer/Text.php | 3 +-- .../Widget/Grid/Column/Renderer/Theme.php | 2 +- .../Widget/Grid/Column/Renderer/Wrapline.php | 2 +- .../core/Mage/Adminhtml/Block/Widget/Tabs.php | 6 +---- .../core/Mage/Adminhtml/Block/Widget/Tree.php | 7 +++++- .../Adminhtml/Controller/Sales/Shipment.php | 6 +++-- .../Mage/Adminhtml/Model/Email/Template.php | 3 +-- .../Model/LayoutUpdate/Validator.php | 5 +---- .../Model/Newsletter/Renderer/Text.php | 3 +-- .../System/Config/Backend/Admin/Usecustom.php | 2 +- .../Config/Backend/Admin/Usecustompath.php | 2 +- .../Config/Backend/Admin/Usesecretkey.php | 2 +- .../Config/Backend/Catalog/Search/Type.php | 2 +- .../Backend/Customer/Address/Street.php | 2 +- .../System/Config/Backend/Locale/Timezone.php | 2 +- .../Config/Backend/Shipping/Tablerate.php | 3 +-- .../Model/System/Config/Backend/Sitemap.php | 9 +++++--- .../Model/System/Config/Backend/Store.php | 2 +- .../Model/System/Config/Backend/Symlink.php | 7 +++--- .../Model/System/Config/Backend/Translate.php | 2 +- .../Config/Source/Catalog/Search/Type.php | 2 +- .../Config/Source/Catalog/TimeFormat.php | 7 +++++- .../Config/Source/Customer/Address/Type.php | 2 +- .../Model/System/Config/Source/Date/Short.php | 7 +++++- .../System/Config/Source/Email/Smtpauth.php | 7 +++++- .../System/Config/Source/Email/Template.php | 2 +- .../System/Config/Source/Locale/Timezone.php | 6 +++-- .../Config/Source/Locale/Weekdaycodes.php | 6 +++-- .../System/Config/Source/Locale/Weekdays.php | 6 +++-- .../System/Config/Source/Order/Status.php | 6 ++++- .../Model/System/Config/Source/Price/Step.php | 7 +++++- .../Config/Source/Product/Options/Type.php | 2 +- .../Config/Source/Product/Thumbnail.php | 3 ++- .../Config/Source/Shipping/Tablerate.php | 7 +++++- .../Config/Source/Shipping/Taxclass.php | 9 ++++++-- .../Config/Source/Storage/Media/Storage.php | 9 ++++---- .../Model/System/Config/Source/Store.php | 7 +++++- .../Model/System/Config/Source/Website.php | 7 +++++- .../Model/System/Config/Source/Yesno.php | 8 +++---- .../System/Config/Source/Yesnocustom.php | 9 ++++---- .../Mage/Adminhtml/Model/System/Store.php | 3 +-- app/code/core/Mage/Adminhtml/Model/Url.php | 8 ++++++- .../controllers/Api/UserController.php | 8 ++++++- .../Catalog/Category/WidgetController.php | 2 +- .../Catalog/Product/SetController.php | 2 +- .../Catalog/Product/WidgetController.php | 2 +- .../Cms/Block/WidgetController.php | 2 +- .../controllers/Cms/Page/WidgetController.php | 2 +- .../controllers/Cms/WysiwygController.php | 2 +- .../System/Config/ValidatevatController.php | 2 +- .../Product/Composite/WishlistController.php | 2 +- .../controllers/Media/UploaderController.php | 2 +- .../Newsletter/SubscriberController.php | 2 +- .../Newsletter/TemplateController.php | 4 ++-- .../Permissions/UserController.php | 8 ++++++- .../Permissions/VariableController.php | 2 +- .../controllers/Promo/WidgetController.php | 7 +++++- .../controllers/Report/ShopcartController.php | 2 +- .../Report/StatisticsController.php | 2 +- .../controllers/Report/TagController.php | 2 +- .../Sales/Order/ShipmentController.php | 2 +- .../Sales/Order/StatusController.php | 2 +- .../controllers/Sales/ShipmentController.php | 6 +++-- .../Sales/TransactionsController.php | 6 +++-- .../controllers/SitemapController.php | 3 ++- .../Config/System/StorageController.php | 2 +- .../System/Email/TemplateController.php | 2 +- .../controllers/System/StoreController.php | 3 +-- .../controllers/System/VariableController.php | 2 +- .../controllers/SystemController.php | 2 +- .../Adminhtml/controllers/TagController.php | 3 +-- .../Adminhtml/controllers/TaxController.php | 2 +- .../controllers/UrlrewriteController.php | 2 +- .../core/Mage/Adminhtml/etc/adminhtml.xml | 2 +- app/code/core/Mage/Adminhtml/etc/config.xml | 2 +- .../core/Mage/Adminhtml/etc/jstranslator.xml | 2 +- .../core/Mage/Api/Model/Acl/Assert/Time.php | 8 +++---- .../core/Mage/Api/Model/Acl/Role/User.php | 9 ++++---- app/code/core/Mage/Api/Model/Mysql4/User.php | 12 +++++----- .../core/Mage/Api/Model/Resource/User.php | 16 +++++--------- .../Mage/Api/Model/Server/Adapter/Soap.php | 6 ++--- .../Mage/Api/Model/Server/Adapter/Xmlrpc.php | 6 ++--- .../Mage/Api/Model/Server/V2/Adapter/Soap.php | 6 ++--- .../Api/Model/Server/Wsi/Adapter/Soap.php | 6 ++--- app/code/core/Mage/Api/Model/User.php | 21 ++++++------------ .../Mage/Api/controllers/SoapController.php | 6 ++--- .../Api/controllers/V2/SoapController.php | 6 ++--- .../Mage/Api/controllers/XmlrpcController.php | 6 ++--- app/code/core/Mage/Api/etc/adminhtml.xml | 2 +- app/code/core/Mage/Api/etc/api.xml | 2 +- app/code/core/Mage/Api/etc/config.xml | 2 +- app/code/core/Mage/Api/etc/system.xml | 10 ++++----- .../Mage/Api2/Block/Adminhtml/Attribute.php | 3 --- .../Block/Adminhtml/Attribute/Buttons.php | 3 --- .../Api2/Block/Adminhtml/Attribute/Tabs.php | 9 +++----- .../core/Mage/Api2/Block/Adminhtml/Roles.php | 3 --- .../Api2/Block/Adminhtml/Roles/Buttons.php | 3 --- .../Mage/Api2/Block/Adminhtml/Roles/Grid.php | 3 --- .../Api2/Block/Adminhtml/Roles/Tab/Users.php | 10 ++++----- .../Mage/Api2/Block/Adminhtml/Roles/Tabs.php | 11 ++++------ .../Mage/Api2/Model/Acl/Global/Rule/Tree.php | 6 ++--- app/code/core/Mage/Api2/Model/Auth/User.php | 12 +++++----- .../core/Mage/Api2/Model/Renderer/Xml.php | 6 ++--- .../Mage/Api2/Model/Renderer/Xml/Writer.php | 6 ++--- .../Api2/Model/Request/Interpreter/Xml.php | 12 +++++----- .../core/Mage/Api2/Model/Resource/Setup.php | 12 +++++----- .../Mage/Api2/Model/Resource/Validator.php | 6 ++--- app/code/core/Mage/Api2/etc/adminhtml.xml | 2 +- app/code/core/Mage/Api2/etc/config.xml | 2 +- .../Authorizenet/Model/Directpost/Session.php | 6 ++--- .../core/Mage/Authorizenet/etc/config.xml | 2 +- .../core/Mage/Authorizenet/etc/system.xml | 10 ++++----- app/code/core/Mage/Backup/Helper/Data.php | 6 ++--- .../Mage/Backup/Model/Config/Source/Type.php | 6 ++--- app/code/core/Mage/Backup/etc/adminhtml.xml | 2 +- app/code/core/Mage/Backup/etc/config.xml | 2 +- app/code/core/Mage/Backup/etc/system.xml | 10 ++++----- .../Product/Edit/Tab/Attributes/Special.php | 12 +++++----- .../Adminhtml/Catalog/Product/Edit/Tabs.php | 12 +++++----- .../Bundle/Block/Catalog/Product/View.php | 6 ++--- .../Bundle/Model/Mysql4/Indexer/Stock.php | 12 +++++----- .../Product/Attribute/Source/Price/View.php | 12 +++++----- .../core/Mage/Bundle/Model/Product/Type.php | 12 +++++----- .../Bundle/Model/Resource/Indexer/Stock.php | 12 +++++----- .../Mage/Bundle/Model/Resource/Option.php | 6 ----- .../Bundle/Model/Resource/Price/Index.php | 3 --- .../Mage/Bundle/Model/Resource/Selection.php | 4 ---- .../Model/Sales/Order/Pdf/Items/Shipment.php | 6 ++--- .../Source/Option/Selection/Price/Type.php | 6 ++--- .../Mage/Bundle/Model/Source/Option/Type.php | 6 ++--- app/code/core/Mage/Bundle/etc/config.xml | 2 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 6 ++--- .../core/Mage/Captcha/Block/Captcha/Zend.php | 2 +- .../core/Mage/Captcha/Model/Resource/Log.php | 4 ---- app/code/core/Mage/Captcha/Model/Zend.php | 2 +- app/code/core/Mage/Captcha/etc/config.xml | 2 +- app/code/core/Mage/Captcha/etc/system.xml | 10 ++++----- .../core/Mage/Catalog/Block/Category/View.php | 8 +++---- .../core/Mage/Catalog/Block/Layer/State.php | 6 ++--- .../core/Mage/Catalog/Block/Layer/View.php | 12 +++++----- .../Catalog/Block/Product/Compare/Sidebar.php | 6 ++--- .../Catalog/Block/Product/List/Toolbar.php | 12 +++++----- .../Catalog/Block/Product/List/Upsell.php | 9 ++++---- .../Catalog/Block/Product/Price/Template.php | 12 +++++----- .../core/Mage/Catalog/Block/Product/View.php | 13 +++++------ .../Block/Product/View/Options/Type/Text.php | 7 +++--- .../Mage/Catalog/Block/Product/View/Tabs.php | 6 ++--- .../Block/Product/View/Type/Simple.php | 8 +++---- .../Block/Product/View/Type/Virtual.php | 9 ++++---- .../core/Mage/Catalog/Helper/Product/Url.php | 6 ++--- .../core/Mage/Catalog/Helper/Product/View.php | 10 +++++---- .../Api2/Product/Category/Rest/Admin/V1.php | 6 ++--- .../Product/Category/Rest/Customer/V1.php | 6 ++--- .../Api2/Product/Category/Rest/Guest/V1.php | 6 ++--- .../Api2/Product/Image/Rest/Admin/V1.php | 6 ++--- .../Api2/Product/Image/Rest/Customer/V1.php | 6 ++--- .../Api2/Product/Image/Rest/Guest/V1.php | 6 ++--- .../Model/Api2/Product/Rest/Admin/V1.php | 6 ++--- .../Model/Api2/Product/Rest/Customer/V1.php | 6 ++--- .../Model/Api2/Product/Rest/Guest/V1.php | 6 ++--- .../Catalog/Model/Api2/Product/Website.php | 6 ++--- .../Api2/Product/Website/Rest/Admin/V1.php | 6 ++--- .../Website/Validator/Admin/Website.php | 6 ++--- .../Mage/Catalog/Model/Category/Api/V2.php | 6 ++--- .../Model/Category/Attribute/Api/V2.php | 6 ++--- .../Category/Attribute/Backend/Sortby.php | 6 ++--- .../Category/Attribute/Backend/Urlkey.php | 7 +++--- .../Category/Attribute/Source/Sortby.php | 6 ++--- .../core/Mage/Catalog/Model/Category/Url.php | 6 ++--- .../Catalog/Model/Convert/Adapter/Product.php | 5 ----- .../core/Mage/Catalog/Model/Indexer/Url.php | 10 ++++++--- .../core/Mage/Catalog/Model/Layer/State.php | 12 +++++----- .../Mage/Catalog/Model/Product/Api/V2.php | 6 ++--- .../Model/Product/Attribute/Api/V2.php | 6 ++--- .../Model/Product/Attribute/Backend/Sku.php | 6 ++--- .../Product/Attribute/Backend/Startdate.php | 6 ++--- .../Backend/Startdate/Specialprice.php | 9 ++++---- .../Product/Attribute/Backend/Tierprice.php | 6 ++--- .../Product/Attribute/Backend/Urlkey.php | 7 +++--- .../Model/Product/Attribute/Media/Api/V2.php | 6 ++--- .../Model/Product/Attribute/Set/Api/V2.php | 6 ++--- .../Product/Attribute/Source/Msrp/Type.php | 6 ++--- .../Product/Attribute/Tierprice/Api/V2.php | 6 ++--- .../Catalog/Model/Product/Link/Api/V2.php | 6 ++--- .../Catalog/Model/Product/Option/Api/V2.php | 6 ++--- .../Model/Product/Option/Type/Default.php | 2 -- .../Model/Product/Option/Type/Text.php | 6 ++--- .../Catalog/Model/Product/Option/Value.php | 14 ++++++------ .../Model/Product/Option/Value/Api/V2.php | 6 ++--- .../Mage/Catalog/Model/Product/Status.php | 17 ++++++-------- .../core/Mage/Catalog/Model/Product/Type.php | 12 +++++----- .../Catalog/Model/Product/Type/Api/V2.php | 6 ++--- .../Catalog/Model/Product/Type/Simple.php | 12 +++++----- .../Catalog/Model/Product/Type/Virtual.php | 6 ++--- .../core/Mage/Catalog/Model/Product/Url.php | 6 ++--- .../Mage/Catalog/Model/Product/Visibility.php | 6 ++--- .../Mage/Catalog/Model/Product/Website.php | 14 ++++++------ .../Model/Resource/Category/Collection.php | 4 ---- .../Resource/Category/Flat/Collection.php | 4 ---- .../Resource/Category/Indexer/Product.php | 4 ---- .../Catalog/Model/Resource/Category/Tree.php | 12 +++++----- .../Mage/Catalog/Model/Resource/Config.php | 4 ---- .../Catalog/Model/Resource/Eav/Attribute.php | 4 ---- .../Resource/Eav/Mysql4/Category/Tree.php | 12 +++++----- .../Product/Attribute/Backend/Tierprice.php | 12 +++++----- .../Product/Attribute/Backend/Urlkey.php | 12 +++++----- .../Product/Attribute/Frontend/Tierprice.php | 12 +++++----- .../Eav/Mysql4/Product/Indexer/Eav/Source.php | 12 +++++----- .../Eav/Mysql4/Product/Option/Value.php | 12 +++++----- .../Resource/Eav/Mysql4/Product/Status.php | 12 +++++----- .../Resource/Eav/Mysql4/Product/Website.php | 12 +++++----- .../Model/Resource/Eav/Mysql4/Setup.php | 12 +++++----- .../Catalog/Model/Resource/Eav/Mysql4/Url.php | 12 +++++----- .../Model/Resource/Layer/Filter/Attribute.php | 4 ---- .../Model/Resource/Layer/Filter/Decimal.php | 4 ---- .../Model/Resource/Layer/Filter/Price.php | 4 ---- .../Product/Attribute/Backend/Groupprice.php | 4 ---- .../Product/Attribute/Backend/Tierprice.php | 16 +++++--------- .../Product/Attribute/Backend/Urlkey.php | 12 +++++----- .../Product/Attribute/Frontend/Tierprice.php | 12 +++++----- .../Model/Resource/Product/Compare/Item.php | 4 ---- .../Model/Resource/Product/Flat/Indexer.php | 4 ---- .../Resource/Product/Indexer/Eav/Decimal.php | 4 ---- .../Resource/Product/Indexer/Eav/Source.php | 16 +++++--------- .../Catalog/Model/Resource/Product/Link.php | 3 --- .../Catalog/Model/Resource/Product/Option.php | 4 ---- .../Model/Resource/Product/Option/Value.php | 16 +++++--------- .../Catalog/Model/Resource/Product/Status.php | 16 +++++--------- .../Configurable/Attribute/Collection.php | 4 ---- .../Model/Resource/Product/Website.php | 16 +++++--------- .../Mage/Catalog/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Catalog/Model/Resource/Url.php | 12 +++++----- app/code/core/Mage/Catalog/Model/Session.php | 8 +++---- .../Backend/Catalog/Url/Rewrite/Suffix.php | 10 ++++++--- app/code/core/Mage/Catalog/Model/Url.php | 6 ++--- .../controllers/Seo/SitemapController.php | 8 +++---- app/code/core/Mage/Catalog/etc/adminhtml.xml | 2 +- app/code/core/Mage/Catalog/etc/api.xml | 2 +- app/code/core/Mage/Catalog/etc/api2.xml | 2 +- app/code/core/Mage/Catalog/etc/config.xml | 2 +- app/code/core/Mage/Catalog/etc/convert.xml | 2 +- app/code/core/Mage/Catalog/etc/system.xml | 10 ++++----- app/code/core/Mage/Catalog/etc/widget.xml | 8 +++---- .../upgrade-1.6.0.0-1.6.0.0.1.php | 8 +++---- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 7 +++--- .../upgrade-1.6.0.0.10-1.6.0.0.11.php | 6 ++--- .../upgrade-1.6.0.0.11-1.6.0.0.12.php | 7 +++--- .../upgrade-1.6.0.0.14-1.6.0.0.15.php | 8 +++---- .../upgrade-1.6.0.0.15-1.6.0.0.18.php | 6 ++--- .../upgrade-1.6.0.0.18-1.6.0.0.19.php | 9 ++++---- .../upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php | 9 ++++---- .../upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php | 8 +++---- .../upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php | 6 ++--- .../upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php | 8 +++---- .../upgrade-1.6.0.0.2-1.6.0.0.3.php | 7 +++--- .../upgrade-1.6.0.0.3-1.6.0.0.4.php | 8 +++---- .../upgrade-1.6.0.0.4-1.6.0.0.5.php | 9 ++++---- .../upgrade-1.6.0.0.5-1.6.0.0.6.php | 8 +++---- .../upgrade-1.6.0.0.6-1.6.0.0.7.php | 6 ++--- .../upgrade-1.6.0.0.7-1.6.0.0.8.php | 6 ++--- .../upgrade-1.6.0.0.9-1.6.0.0.10.php | 6 ++--- .../Mage/CatalogIndex/Model/Data/Simple.php | 11 +++++----- .../Mage/CatalogIndex/Model/Data/Virtual.php | 10 +++++---- .../CatalogIndex/Model/Indexer/Tierprice.php | 14 ++++++------ .../Mage/CatalogIndex/Model/Mysql4/Setup.php | 12 +++++----- .../CatalogIndex/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/CatalogIndex/etc/config.xml | 2 +- .../Mage/CatalogInventory/Helper/Data.php | 6 ++--- .../Model/Api2/Stock/Item/Rest/Admin/V1.php | 6 ++--- .../CatalogInventory/Model/Indexer/Stock.php | 18 ++++++--------- .../Model/Mysql4/Indexer/Stock.php | 12 +++++----- .../CatalogInventory/Model/Mysql4/Stock.php | 12 +++++----- .../Model/Mysql4/Stock/Status.php | 12 +++++----- .../Model/Resource/Indexer/Stock.php | 16 +++++--------- .../Model/Resource/Indexer/Stock/Default.php | 4 ---- .../CatalogInventory/Model/Resource/Stock.php | 16 +++++--------- .../Model/Resource/Stock/Item.php | 4 ---- .../Model/Resource/Stock/Status.php | 16 +++++--------- .../CatalogInventory/Model/Source/Stock.php | 8 +++---- .../Mage/CatalogInventory/Model/Stock.php | 14 ++++++------ .../Model/Stock/Item/Api/V2.php | 8 ++++--- .../CatalogInventory/Model/Stock/Status.php | 14 ++++++------ .../Mage/CatalogInventory/etc/adminhtml.xml | 2 +- .../core/Mage/CatalogInventory/etc/api.xml | 2 +- .../core/Mage/CatalogInventory/etc/api2.xml | 2 +- .../core/Mage/CatalogInventory/etc/config.xml | 2 +- .../core/Mage/CatalogInventory/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 6 ++--- .../core/Mage/CatalogRule/Helper/Data.php | 6 ++--- .../core/Mage/CatalogRule/etc/adminhtml.xml | 2 +- app/code/core/Mage/CatalogRule/etc/config.xml | 2 +- .../upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../upgrade-1.6.0.2-1.6.0.3.php | 7 +++--- .../core/Mage/CatalogSearch/Block/Term.php | 6 ++--- .../core/Mage/CatalogSearch/Helper/Data.php | 6 ++--- .../core/Mage/CatalogSearch/Model/Query.php | 7 ------ .../CatalogSearch/Model/Resource/Advanced.php | 4 ---- .../Model/Resource/Indexer/Fulltext.php | 3 --- .../core/Mage/CatalogSearch/Model/Session.php | 11 +++++++--- .../Model/System/Config/Backend/Sitemap.php | 9 +++++--- .../controllers/TermController.php | 12 ++++++---- .../core/Mage/CatalogSearch/etc/adminhtml.xml | 2 +- .../core/Mage/CatalogSearch/etc/config.xml | 2 +- .../core/Mage/CatalogSearch/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0-1.8.2.0.php | 6 ++--- .../Centinel/Block/Adminhtml/Validation.php | 13 ++++++----- .../Centinel/Block/Authentication/Start.php | 11 ++++++---- app/code/core/Mage/Centinel/Helper/Data.php | 6 ++--- app/code/core/Mage/Centinel/Model/Session.php | 13 +++++------ .../core/Mage/Centinel/Model/State/Visa.php | 10 ++++++--- .../Mage/Centinel/Model/StateAbstract.php | 10 ++++++--- app/code/core/Mage/Centinel/etc/config.xml | 2 +- app/code/core/Mage/Centinel/etc/system.xml | 10 ++++----- .../Mage/Checkout/Block/Cart/Shipping.php | 10 +++++---- .../core/Mage/Checkout/Block/Cart/Sidebar.php | 12 +++++----- .../core/Mage/Checkout/Block/Cart/Totals.php | 11 +++++++--- .../Checkout/Block/Multishipping/Shipping.php | 6 ++--- .../Checkout/Block/Multishipping/State.php | 8 +++---- .../Checkout/Block/Multishipping/Success.php | 8 +++---- .../Mage/Checkout/Block/Onepage/Shipping.php | 10 +++++---- .../Mage/Checkout/Block/Onepage/Success.php | 6 ++--- app/code/core/Mage/Checkout/Block/Success.php | 10 ++++++--- .../core/Mage/Checkout/Block/Total/Tax.php | 10 +++++---- app/code/core/Mage/Checkout/Helper/Data.php | 6 ++--- app/code/core/Mage/Checkout/Helper/Url.php | 10 +++++---- .../core/Mage/Checkout/Model/Cart/Api/V2.php | 12 +++++----- .../Checkout/Model/Cart/Coupon/Api/V2.php | 13 +++++------ .../Checkout/Model/Cart/Customer/Api/V2.php | 12 +++++----- .../Checkout/Model/Cart/Payment/Api/V2.php | 13 +++++------ .../Checkout/Model/Cart/Product/Api/V2.php | 13 +++++------ .../Checkout/Model/Cart/Shipping/Api/V2.php | 13 +++++------ .../Model/Config/Source/Cart/Summary.php | 12 +++++++--- .../core/Mage/Checkout/Model/Mysql4/Setup.php | 12 +++++----- .../Checkout/Model/Resource/Agreement.php | 4 ---- .../Mage/Checkout/Model/Resource/Cart.php | 4 ---- .../Mage/Checkout/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Checkout/Model/Session.php | 10 +++++---- .../Checkout/Model/Type/Multishipping.php | 3 --- .../Model/Type/Multishipping/State.php | 8 +++---- app/code/core/Mage/Checkout/etc/adminhtml.xml | 2 +- app/code/core/Mage/Checkout/etc/api.xml | 2 +- app/code/core/Mage/Checkout/etc/config.xml | 2 +- .../core/Mage/Checkout/etc/jstranslator.xml | 2 +- app/code/core/Mage/Checkout/etc/system.xml | 10 ++++----- .../Mage/Cms/Model/Wysiwyg/Images/Storage.php | 12 +++++----- app/code/core/Mage/Cms/etc/adminhtml.xml | 2 +- app/code/core/Mage/Cms/etc/config.xml | 2 +- app/code/core/Mage/Cms/etc/system.xml | 10 ++++----- app/code/core/Mage/Cms/etc/widget.xml | 8 +++---- .../Block/Catalog/Layer/State/Swatch.php | 10 ++++++--- .../View/Type/Configurable/Swatches.php | 10 ++++++--- .../Mage/ConfigurableSwatches/Helper/Data.php | 6 ++--- .../Helper/Swatchdimensions.php | 10 ++++++--- .../ConfigurableSwatches/etc/adminhtml.xml | 2 +- .../Mage/ConfigurableSwatches/etc/config.xml | 2 +- .../ConfigurableSwatches/etc/jstranslator.xml | 2 +- .../Mage/ConfigurableSwatches/etc/system.xml | 10 ++++----- app/code/core/Mage/Contacts/etc/adminhtml.xml | 2 +- app/code/core/Mage/Contacts/etc/config.xml | 2 +- app/code/core/Mage/Contacts/etc/system.xml | 10 ++++----- .../core/Mage/Core/Block/Store/Switcher.php | 8 +++---- app/code/core/Mage/Core/Block/Template.php | 6 ++--- .../core/Mage/Core/Block/Template/Smarty.php | 12 ++++++---- .../core/Mage/Core/Block/Template/Zend.php | 8 +++---- app/code/core/Mage/Core/Block/Text.php | 10 +++++---- app/code/core/Mage/Core/Block/Text/Tag.php | 11 +++++----- .../Mage/Core/Controller/Varien/Action.php | 2 -- .../Controller/Varien/Router/Standard.php | 11 +++++++--- app/code/core/Mage/Core/Helper/Data.php | 6 ++--- .../core/Mage/Core/Helper/File/Storage.php | 12 +++++----- app/code/core/Mage/Core/Helper/String.php | 10 +++++---- app/code/core/Mage/Core/Helper/Translate.php | 10 +++++---- .../Mage/Core/Helper/UnserializeArray.php | 12 +++++----- app/code/core/Mage/Core/Helper/Url.php | 13 +++++------ app/code/core/Mage/Core/Model/App.php | 3 --- .../core/Mage/Core/Model/App/Emulation.php | 2 -- .../core/Mage/Core/Model/Config/System.php | 8 +++---- .../core/Mage/Core/Model/Design/Fallback.php | 1 - .../core/Mage/Core/Model/Email/Template.php | 14 ++++++------ .../core/Mage/Core/Model/Email/Transport.php | 11 +++++++--- .../core/Mage/Core/Model/File/Storage.php | 12 +++++----- .../core/Mage/Core/Model/File/Uploader.php | 6 ++--- .../Model/File/Validator/AvailablePath.php | 3 --- .../File/Validator/NotProtectedExtension.php | 3 --- .../Model/File/Validator/StreamWrapper.php | 6 ++--- .../core/Mage/Core/Model/Layout/Update.php | 11 +++++++--- .../core/Mage/Core/Model/Layout/Validator.php | 9 +++----- .../core/Mage/Core/Model/Magento/Api/V2.php | 6 ++--- .../core/Mage/Core/Model/Message/Success.php | 11 +++++++--- .../core/Mage/Core/Model/Message/Warning.php | 11 +++++++--- .../Mage/Core/Model/Mysql4/Email/Template.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Session.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Store.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Translate.php | 12 +++++----- .../Core/Model/Mysql4/Translate/String.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Variable.php | 12 +++++----- .../core/Mage/Core/Model/Mysql4/Website.php | 12 +++++----- .../core/Mage/Core/Model/Resource/Cache.php | 4 ---- .../core/Mage/Core/Model/Resource/Config.php | 4 ---- .../Mage/Core/Model/Resource/Config/Data.php | 4 ---- .../core/Mage/Core/Model/Resource/Design.php | 4 ---- .../Core/Model/Resource/Email/Template.php | 16 +++++--------- .../Mage/Core/Model/Resource/Entity/Table.php | 11 +++++----- .../core/Mage/Core/Model/Resource/Flag.php | 4 ---- .../Mage/Core/Model/Resource/Language.php | 4 ---- .../core/Mage/Core/Model/Resource/Layout.php | 4 ---- .../Mage/Core/Model/Resource/Resource.php | 4 ---- .../core/Mage/Core/Model/Resource/Session.php | 16 +++++--------- .../core/Mage/Core/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Core/Model/Resource/Store.php | 16 +++++--------- .../Mage/Core/Model/Resource/Store/Group.php | 4 ---- .../Mage/Core/Model/Resource/Transaction.php | 8 +++---- .../Mage/Core/Model/Resource/Translate.php | 16 +++++--------- .../Core/Model/Resource/Translate/String.php | 16 +++++--------- .../Model/Resource/Type/Db/Mysqli/Setup.php | 11 +++++++--- .../Mage/Core/Model/Resource/Url/Rewrite.php | 4 ---- .../Mage/Core/Model/Resource/Variable.php | 16 +++++--------- .../core/Mage/Core/Model/Resource/Website.php | 16 +++++--------- app/code/core/Mage/Core/Model/Session.php | 10 +++++---- .../Core/Model/Session/Abstract/Varien.php | 13 +++++++---- .../Mage/Core/Model/Session/Abstract/Zend.php | 8 +++---- .../Core/Model/Source/Email/Variables.php | 10 +++------ app/code/core/Mage/Core/Model/Store.php | 16 ++++++-------- .../core/Mage/Core/Model/Store/Api/V2.php | 6 ++--- app/code/core/Mage/Core/Model/Template.php | 12 +++++----- app/code/core/Mage/Core/Model/Translate.php | 10 +++++---- .../core/Mage/Core/Model/Translate/String.php | 14 ++++++------ app/code/core/Mage/Core/Model/Url.php | 8 +++---- .../core/Mage/Core/Model/Url/Validator.php | 6 ++--- app/code/core/Mage/Core/Model/Variable.php | 14 ++++++------ app/code/core/Mage/Core/Model/Website.php | 15 ++++++------- app/code/core/Mage/Core/etc/api.xml | 2 +- app/code/core/Mage/Core/etc/config.xml | 2 +- app/code/core/Mage/Core/etc/jstranslator.xml | 2 +- app/code/core/Mage/Core/etc/system.xml | 10 ++++----- .../core_setup/upgrade-1.6.0.1-1.6.0.2.php | 7 +++--- .../core_setup/upgrade-1.6.0.2-1.6.0.3.php | 8 +++---- .../core_setup/upgrade-1.6.0.3-1.6.0.4.php | 8 +++---- .../core_setup/upgrade-1.6.0.5-1.6.0.6.php | 7 +++--- .../core_setup/upgrade-1.6.0.6-1.6.0.7.php | 9 ++++---- .../core_setup/upgrade-1.6.0.7-1.6.0.8.php | 9 ++++---- .../core_setup/upgrade-1.6.0.8-1.6.0.9.php | 9 ++++---- .../core_setup/upgrade-1.6.0.9-1.6.0.10.php | 7 +++--- app/code/core/Mage/Cron/etc/config.xml | 2 +- app/code/core/Mage/Cron/etc/system.xml | 10 ++++----- .../Block/Adminhtml/System/Currencysymbol.php | 3 --- .../System/CurrencysymbolController.php | 6 ++--- .../Mage/CurrencySymbol/etc/adminhtml.xml | 2 +- .../core/Mage/CurrencySymbol/etc/config.xml | 2 +- .../Mage/Customer/Block/Account/Dashboard.php | 6 ++--- .../Block/Account/Dashboard/Sidebar.php | 9 ++++---- .../Mage/Customer/Block/Widget/Taxvat.php | 10 ++++++--- .../Mage/Customer/Model/Address/Api/V2.php | 6 ++--- .../Api2/Customer/Address/Rest/Admin/V1.php | 6 ++--- .../Customer/Address/Rest/Customer/V1.php | 6 ++--- .../Model/Api2/Customer/Address/Validator.php | 6 ++--- .../Model/Api2/Customer/Rest/Admin/V1.php | 6 ++--- .../Model/Api2/Customer/Rest/Customer/V1.php | 6 ++--- .../Customer/Model/Attribute/Data/Text.php | 12 +++++----- .../Model/Attribute/Data/Textarea.php | 12 +++++----- .../core/Mage/Customer/Model/Config/Share.php | 8 +++---- .../Model/Convert/Adapter/Customer.php | 6 ++--- .../Model/Convert/Parser/Customer.php | 6 ++--- .../core/Mage/Customer/Model/Customer.php | 6 ++--- .../Mage/Customer/Model/Customer/Api/V2.php | 6 ++--- .../Customer/Attribute/Backend/Shipping.php | 8 +++---- .../Customer/Attribute/Backend/Store.php | 8 +++---- .../Customer/Attribute/Backend/Website.php | 8 +++---- .../Model/Customer/Attribute/Source/Store.php | 8 +++---- .../Customer/Attribute/Source/Website.php | 8 +++---- .../Address/Attribute/Backend/Street.php | 12 +++++----- .../Address/Attribute/Source/Country.php | 2 -- .../core/Mage/Customer/Model/Entity/Setup.php | 12 +++++----- .../core/Mage/Customer/Model/Group/Api/V2.php | 6 ++--- .../Address/Attribute/Backend/Street.php | 12 +++++----- .../Model/Resource/Form/Attribute.php | 4 ---- .../Mage/Customer/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Customer/Model/Session.php | 14 ++++++------ app/code/core/Mage/Customer/etc/adminhtml.xml | 2 +- app/code/core/Mage/Customer/etc/api.xml | 2 +- app/code/core/Mage/Customer/etc/api2.xml | 2 +- app/code/core/Mage/Customer/etc/config.xml | 2 +- app/code/core/Mage/Customer/etc/system.xml | 10 ++++----- .../upgrade-1.6.1.0-1.6.2.0.php | 6 ++--- .../upgrade-1.6.2.0-1.6.2.0.1.php | 6 ++--- .../upgrade-1.6.2.0.1-1.6.2.0.2.php | 6 ++--- .../upgrade-1.6.2.0.3-1.6.2.0.4.php | 6 ++--- .../upgrade-1.6.2.0.4-1.6.2.0.5.php | 6 ++--- .../upgrade-1.6.2.0.5-1.6.2.0.6.php | 6 ++--- .../upgrade-1.6.2.0.6-1.6.2.0.7.php | 6 ++--- .../Model/Convert/Adapter/Db/Table.php | 10 ++++----- .../Dataflow/Model/Convert/Adapter/Soap.php | 10 ++++----- .../Dataflow/Model/Convert/Adapter/Std.php | 10 ++++----- .../Mage/Dataflow/Model/Mysql4/Session.php | 12 +++++----- .../Mage/Dataflow/Model/Resource/Batch.php | 4 ---- .../Dataflow/Model/Resource/Batch/Export.php | 4 ---- .../Dataflow/Model/Resource/Batch/Import.php | 4 ---- .../Mage/Dataflow/Model/Resource/Import.php | 4 ---- .../Mage/Dataflow/Model/Resource/Profile.php | 4 ---- .../Model/Resource/Profile/History.php | 3 --- .../Mage/Dataflow/Model/Resource/Session.php | 16 +++++--------- app/code/core/Mage/Dataflow/Model/Session.php | 16 ++++++-------- app/code/core/Mage/Dataflow/etc/config.xml | 2 +- .../Adminhtml/Frontend/Region/Updater.php | 11 +++++++--- app/code/core/Mage/Directory/Helper/Data.php | 1 - app/code/core/Mage/Directory/Helper/Url.php | 10 +++++---- .../Mage/Directory/Model/Country/Api/V2.php | 6 ++--- .../Model/Currency/Import/Webservicex.php | 9 ++++---- .../Mage/Directory/Model/Region/Api/V2.php | 6 ++--- .../Model/Resource/Country/Collection.php | 3 --- .../Resource/Country/Format/Collection.php | 4 ---- app/code/core/Mage/Directory/etc/api.xml | 2 +- app/code/core/Mage/Directory/etc/config.xml | 2 +- app/code/core/Mage/Directory/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../Block/Catalog/Product/View/Type.php | 13 +++++------ .../Downloadable/Block/Checkout/Success.php | 7 +++--- .../Downloadable/Model/Link/Api/Uploader.php | 12 +++++----- .../Mage/Downloadable/Model/Link/Api/V2.php | 12 +++++----- .../Downloadable/Model/Link/Api/Validator.php | 12 +++++----- .../Mage/Downloadable/Model/Product/Type.php | 12 +++++----- .../Mage/Downloadable/Model/Resource/Link.php | 3 --- .../Downloadable/Model/Resource/Sample.php | 4 ---- .../core/Mage/Downloadable/etc/adminhtml.xml | 2 +- app/code/core/Mage/Downloadable/etc/api.xml | 2 +- .../core/Mage/Downloadable/etc/config.xml | 2 +- .../core/Mage/Downloadable/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0-1.6.0.0.1.php | 6 ++--- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 6 ++--- .../upgrade-1.6.0.0.2-1.6.0.0.3.php | 8 ++++--- .../Config/Source/Inputtype/Validator.php | 6 +---- .../Mage/Eav/Model/Attribute/Data/Text.php | 2 +- .../Eav/Model/Attribute/Data/Textarea.php | 2 +- .../Model/Entity/Attribute/Backend/Store.php | 2 +- .../Entity/Attribute/Backend/Time/Updated.php | 2 +- .../Mage/Eav/Model/Entity/Attribute/Set.php | 6 +---- .../Model/Entity/Attribute/Source/Store.php | 2 +- .../Model/Entity/Attribute/Source/Table.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Setup.php | 2 +- app/code/core/Mage/Eav/Model/Entity/Store.php | 5 +---- app/code/core/Mage/Eav/Model/Entity/Type.php | 5 +---- app/code/core/Mage/Eav/Model/Form/Type.php | 2 +- .../Eav/Model/Mysql4/Entity/Attribute/Set.php | 2 +- .../Mage/Eav/Model/Mysql4/Entity/Store.php | 2 +- .../Mage/Eav/Model/Mysql4/Entity/Type.php | 2 +- .../core/Mage/Eav/Model/Mysql4/Form/Type.php | 2 +- .../Eav/Model/Resource/Entity/Attribute.php | 6 ----- .../Model/Resource/Entity/Attribute/Set.php | 6 +---- .../Mage/Eav/Model/Resource/Entity/Store.php | 5 +---- .../Mage/Eav/Model/Resource/Entity/Type.php | 5 +---- .../Mage/Eav/Model/Resource/Form/Element.php | 3 --- .../Mage/Eav/Model/Resource/Form/Fieldset.php | 3 --- .../Mage/Eav/Model/Resource/Form/Type.php | 6 +---- app/code/core/Mage/Eav/etc/config.xml | 2 +- .../sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php | 4 ++-- app/code/core/Mage/GiftMessage/Helper/Url.php | 8 +++---- .../core/Mage/GiftMessage/Model/Api/V2.php | 6 ++--- .../Mage/GiftMessage/Model/Mysql4/Setup.php | 12 +++++----- .../Mage/GiftMessage/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/GiftMessage/etc/api.xml | 2 +- app/code/core/Mage/GiftMessage/etc/config.xml | 2 +- app/code/core/Mage/GiftMessage/etc/system.xml | 10 ++++----- .../Model/System/Config/Source/Type.php | 7 +++--- .../Mage/GoogleAnalytics/etc/adminhtml.xml | 2 +- .../core/Mage/GoogleAnalytics/etc/config.xml | 2 +- .../core/Mage/GoogleAnalytics/etc/system.xml | 10 ++++----- .../core/Mage/GoogleCheckout/etc/config.xml | 2 +- .../Block/Adminhtml/Import/Edit.php | 3 --- .../Model/Export/Entity/Abstract.php | 3 --- .../Model/Export/Entity/Customer.php | 3 --- .../Model/Export/Entity/Product.php | 3 --- .../Export/Entity/Product/Type/Simple.php | 12 +++++----- .../Model/Import/Entity/Abstract.php | 3 --- .../Model/Import/Entity/Customer.php | 3 --- .../Model/Import/Entity/Customer/Address.php | 2 -- .../Model/Import/Entity/Product.php | 4 ---- .../Import/Entity/Product/Type/Simple.php | 12 +++++----- .../ImportExport/Model/Import/Uploader.php | 12 +++++----- .../Mage/ImportExport/Model/Mysql4/Setup.php | 12 +++++----- .../Product/Attribute/Backend/Urlkey.php | 12 +++++----- .../ImportExport/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/ImportExport/etc/adminhtml.xml | 2 +- .../core/Mage/ImportExport/etc/config.xml | 2 +- .../core/Mage/ImportExport/etc/system.xml | 10 ++++----- .../Block/Adminhtml/Process/Edit/Tabs.php | 12 ++++++---- app/code/core/Mage/Index/Model/Lock.php | 3 --- .../core/Mage/Index/Model/Lock/Storage/Db.php | 3 --- .../core/Mage/Index/Model/Mysql4/Setup.php | 12 +++++----- .../Index/Model/Resource/Lock/Resource.php | 3 --- .../Model/Resource/Process/Collection.php | 4 ---- .../core/Mage/Index/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Index/etc/adminhtml.xml | 2 +- app/code/core/Mage/Index/etc/config.xml | 2 +- app/code/core/Mage/Install/Block/Db/Type.php | 10 +++++---- app/code/core/Mage/Install/Block/State.php | 9 ++++---- app/code/core/Mage/Install/Model/Session.php | 8 +++---- app/code/core/Mage/Install/Model/Wizard.php | 8 +++---- .../Install/controllers/WizardController.php | 10 ++++++--- app/code/core/Mage/Install/etc/config.xml | 2 +- app/code/core/Mage/Install/etc/install.xml | 2 +- .../core/Mage/Log/Model/Mysql4/Visitor.php | 2 +- .../core/Mage/Log/Model/Resource/Visitor.php | 6 +---- .../Log/Model/Resource/Visitor/Online.php | 4 ---- app/code/core/Mage/Log/Model/Visitor.php | 2 +- app/code/core/Mage/Log/etc/config.xml | 2 +- app/code/core/Mage/Log/etc/system.xml | 10 ++++----- app/code/core/Mage/Media/etc/config.xml | 2 +- .../core/Mage/Newsletter/Block/Subscribe.php | 9 ++++---- .../Newsletter/Model/Mysql4/Subscriber.php | 12 +++++----- .../Mage/Newsletter/Model/Mysql4/Template.php | 12 +++++----- .../Mage/Newsletter/Model/Resource/Queue.php | 4 ---- .../Newsletter/Model/Resource/Subscriber.php | 13 +++++------ .../Model/Resource/Subscriber/Collection.php | 5 ----- .../Newsletter/Model/Resource/Template.php | 16 +++++--------- .../core/Mage/Newsletter/Model/Session.php | 9 ++++---- .../core/Mage/Newsletter/Model/Subscriber.php | 17 ++++++-------- .../core/Mage/Newsletter/Model/Template.php | 14 ++++++------ .../controllers/SubscriberController.php | 12 +++++----- .../core/Mage/Newsletter/etc/adminhtml.xml | 2 +- app/code/core/Mage/Newsletter/etc/config.xml | 2 +- app/code/core/Mage/Newsletter/etc/system.xml | 10 ++++----- .../Block/Adminhtml/Oauth/Admin/Token.php | 6 ++--- .../Mage/Oauth/Block/Authorize/Abstract.php | 3 --- .../core/Mage/Oauth/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Oauth/Model/Resource/Token.php | 12 +++++----- app/code/core/Mage/Oauth/Model/Token.php | 13 ++++++----- .../Adminhtml/Oauth/Admin/TokenController.php | 12 +++++----- .../controllers/Customer/TokenController.php | 12 +++++----- .../Oauth/controllers/TokenController.php | 12 +++++----- app/code/core/Mage/Oauth/etc/adminhtml.xml | 2 +- app/code/core/Mage/Oauth/etc/config.xml | 2 +- app/code/core/Mage/Oauth/etc/system.xml | 10 ++++----- .../core/Mage/Page/Block/Html/Toplinks.php | 10 ++++++--- .../core/Mage/Page/Block/Html/Topmenu.php | 12 +++++----- .../core/Mage/Page/Block/Html/Welcome.php | 6 ++--- .../core/Mage/Page/Block/Html/Wrapper.php | 10 ++++++--- .../core/Mage/Page/Block/Js/Translate.php | 10 +++++---- app/code/core/Mage/Page/Block/Switch.php | 8 +++---- app/code/core/Mage/Page/etc/config.xml | 2 +- app/code/core/Mage/Page/etc/system.xml | 10 ++++----- .../Mage/PageCache/Model/Control/Zend.php | 12 +++++----- .../core/Mage/PageCache/etc/adminhtml.xml | 2 +- app/code/core/Mage/PageCache/etc/config.xml | 2 +- app/code/core/Mage/PageCache/etc/system.xml | 10 ++++----- app/code/core/Mage/Paygate/Helper/Data.php | 6 ++--- app/code/core/Mage/Paygate/etc/config.xml | 2 +- app/code/core/Mage/Paygate/etc/system.xml | 10 ++++----- app/code/core/Mage/Payment/Helper/Data.php | 6 ++--- app/code/core/Mage/Payment/etc/adminhtml.xml | 2 +- app/code/core/Mage/Payment/etc/config.xml | 2 +- app/code/core/Mage/Payment/etc/system.xml | 10 ++++----- .../payment_setup/upgrade-1.6.0.0-1.6.0.1.php | 8 +++---- .../System/Config/Field/SolutionType.php | 6 ++--- .../System/Config/Fieldset/Store.php | 11 ++++++---- .../Paypal/Block/Express/Review/Shipping.php | 6 ++--- .../Mage/Paypal/Block/Express/Shortcut.php | 10 ++++++--- app/code/core/Mage/Paypal/Helper/Data.php | 6 ++--- .../core/Mage/Paypal/Model/Api/Standard.php | 10 ++++++--- .../Paypal/Model/Mysql4/Report/Settlement.php | 12 +++++----- .../core/Mage/Paypal/Model/Mysql4/Setup.php | 12 +++++----- .../Mage/Paypal/Model/Payment/Transaction.php | 18 ++++++--------- .../Mage/Paypal/Model/Report/Settlement.php | 20 +++++++---------- .../core/Mage/Paypal/Model/Resource/Cert.php | 3 --- .../Model/Resource/Payment/Transaction.php | 12 +++++----- .../Model/Resource/Report/Settlement.php | 12 +++++----- .../core/Mage/Paypal/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Paypal/Model/Session.php | 10 +++++---- app/code/core/Mage/Paypal/Model/Standard.php | 10 +++++---- .../Model/System/Config/Source/UrlMethod.php | 12 +++++----- .../System/Config/Source/YesnoShortcut.php | 12 +++++----- .../core/Mage/Paypal/UnavailableException.php | 12 ++++++---- .../Paypal/controllers/StandardController.php | 8 +++---- app/code/core/Mage/Paypal/etc/adminhtml.xml | 2 +- app/code/core/Mage/Paypal/etc/config.xml | 2 +- app/code/core/Mage/Paypal/etc/system.xml | 10 ++++----- .../paypal_setup/upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../paypal_setup/upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../paypal_setup/upgrade-1.6.0.3-1.6.0.4.php | 6 ++--- .../Mage/PaypalUk/Block/Express/Shortcut.php | 10 ++++++--- app/code/core/Mage/PaypalUk/Helper/Data.php | 6 ++--- app/code/core/Mage/PaypalUk/Model/Session.php | 10 +++++---- app/code/core/Mage/PaypalUk/etc/config.xml | 2 +- .../core/Mage/Persistent/Helper/Session.php | 6 ++--- .../Persistent/Model/Observer/Session.php | 6 ++--- .../Persistent/Model/Resource/Session.php | 15 +++++-------- .../core/Mage/Persistent/Model/Session.php | 6 ++--- .../core/Mage/Persistent/etc/adminhtml.xml | 2 +- app/code/core/Mage/Persistent/etc/config.xml | 2 +- .../core/Mage/Persistent/etc/persistent.xml | 2 +- app/code/core/Mage/Persistent/etc/system.xml | 10 ++++----- app/code/core/Mage/Poll/Helper/Data.php | 6 ++--- .../core/Mage/Poll/Model/Mysql4/Poll/Vote.php | 12 +++++----- app/code/core/Mage/Poll/Model/Poll/Vote.php | 14 ++++++------ .../Mage/Poll/Model/Resource/Poll/Vote.php | 12 +++++----- .../Mage/Poll/controllers/VoteController.php | 12 +++++----- app/code/core/Mage/Poll/etc/adminhtml.xml | 2 +- app/code/core/Mage/Poll/etc/config.xml | 2 +- app/code/core/Mage/Poll/etc/system.xml | 10 ++++----- .../Mage/ProductAlert/Block/Email/Stock.php | 12 ++++------ .../Mage/ProductAlert/Block/Product/View.php | 11 +++++++--- .../core/Mage/ProductAlert/Block/Stock.php | 9 +++++--- .../Mage/ProductAlert/Model/Mysql4/Stock.php | 12 +++++----- .../ProductAlert/Model/Resource/Price.php | 4 ---- .../ProductAlert/Model/Resource/Stock.php | 16 +++++--------- .../core/Mage/ProductAlert/Model/Stock.php | 14 ++++++------ .../controllers/UnsubscribeController.php | 8 +++---- .../core/Mage/ProductAlert/etc/config.xml | 2 +- .../core/Mage/ProductAlert/etc/system.xml | 10 ++++----- app/code/core/Mage/Rating/Helper/Data.php | 6 ++--- .../Model/Mysql4/Rating/Option/Vote.php | 12 +++++----- .../Mage/Rating/Model/Rating/Option/Vote.php | 9 ++++---- .../Model/Resource/Rating/Option/Vote.php | 16 +++++--------- app/code/core/Mage/Rating/etc/adminhtml.xml | 2 +- app/code/core/Mage/Rating/etc/config.xml | 2 +- .../Mage/Reports/Block/Product/Viewed.php | 6 ++--- .../Reports/Block/Product/Widget/Viewed.php | 10 +++------ app/code/core/Mage/Reports/Helper/Data.php | 6 ++--- app/code/core/Mage/Reports/Model/Event.php | 6 ++--- .../core/Mage/Reports/Model/Event/Type.php | 15 ++++++------- .../Mage/Reports/Model/Mysql4/Event/Type.php | 12 +++++----- .../Model/Mysql4/Product/Index/Viewed.php | 12 +++++----- .../Reports/Model/Product/Index/Viewed.php | 14 ++++++------ .../Reports/Model/Resource/Event/Type.php | 16 +++++--------- .../Model/Resource/Product/Index/Compared.php | 4 ---- .../Model/Resource/Product/Index/Viewed.php | 16 +++++--------- .../Model/Resource/Report/Product/Viewed.php | 16 +++++--------- app/code/core/Mage/Reports/Model/Session.php | 6 ++--- app/code/core/Mage/Reports/Model/Test.php | 10 ++++----- app/code/core/Mage/Reports/Model/Totals.php | 8 +++---- app/code/core/Mage/Reports/etc/adminhtml.xml | 2 +- app/code/core/Mage/Reports/etc/config.xml | 2 +- app/code/core/Mage/Reports/etc/system.xml | 10 ++++----- app/code/core/Mage/Reports/etc/widget.xml | 8 +++---- .../upgrade-1.6.0.0-1.6.0.0.1.php | 9 +++----- .../core/Mage/Review/Block/Customer/View.php | 8 +++---- .../core/Mage/Review/Block/Product/View.php | 6 ++--- app/code/core/Mage/Review/Block/View.php | 8 +++---- app/code/core/Mage/Review/Helper/Data.php | 6 ++--- .../Review/Model/Mysql4/Review/Summary.php | 12 +++++----- .../Mage/Review/Model/Resource/Review.php | 1 - .../Review/Model/Resource/Review/Status.php | 17 +++++--------- .../Review/Model/Resource/Review/Summary.php | 12 +++++----- .../core/Mage/Review/Model/Review/Status.php | 10 ++++----- .../core/Mage/Review/Model/Review/Summary.php | 9 ++++---- app/code/core/Mage/Review/Model/Session.php | 8 +++---- app/code/core/Mage/Review/etc/adminhtml.xml | 2 +- app/code/core/Mage/Review/etc/config.xml | 2 +- app/code/core/Mage/Review/etc/system.xml | 10 ++++----- .../core/Mage/Rss/Block/Catalog/Special.php | 8 +++---- app/code/core/Mage/Rss/Block/Catalog/Tag.php | 8 +++---- app/code/core/Mage/Rss/Block/Order/Status.php | 8 +++---- app/code/core/Mage/Rss/Block/Wishlist.php | 6 ++--- app/code/core/Mage/Rss/Model/Session.php | 8 +++---- app/code/core/Mage/Rss/etc/adminhtml.xml | 2 +- app/code/core/Mage/Rss/etc/config.xml | 2 +- app/code/core/Mage/Rss/etc/system.xml | 10 ++++----- app/code/core/Mage/Rule/Helper/Data.php | 6 ++--- .../Resource/Rule/Condition/SqlBuilder.php | 14 +++++++----- app/code/core/Mage/Rule/etc/config.xml | 2 +- .../Adminhtml/Billing/Agreement/View.php | 10 +++++---- .../Adminhtml/Billing/Agreement/View/Tabs.php | 14 +++++------- .../Adminhtml/Recurring/Profile/View.php | 10 ++++++--- .../Sales/Block/Billing/Agreement/View.php | 10 +++++---- .../Sales/Block/Order/Creditmemo/Totals.php | 12 +++++++--- .../Mage/Sales/Block/Order/Invoice/Totals.php | 12 +++++++--- .../Mage/Sales/Block/Order/Print/Shipment.php | 9 ++++---- .../core/Mage/Sales/Block/Order/Shipment.php | 8 +++---- app/code/core/Mage/Sales/Block/Order/Tax.php | 8 +++---- .../core/Mage/Sales/Block/Order/Totals.php | 12 +++++++--- app/code/core/Mage/Sales/Block/Order/View.php | 8 +++---- .../Sales/Block/Recurring/Profile/View.php | 10 ++++++--- .../core/Mage/Sales/Block/Reorder/Sidebar.php | 14 ++++++------ .../Api2/Order/Address/Rest/Admin/V1.php | 6 ++--- .../Api2/Order/Address/Rest/Customer/V1.php | 6 ++--- .../Api2/Order/Comment/Rest/Admin/V1.php | 6 ++--- .../Api2/Order/Comment/Rest/Customer/V1.php | 6 ++--- .../Model/Api2/Order/Item/Rest/Admin/V1.php | 6 ++--- .../Api2/Order/Item/Rest/Customer/V1.php | 6 ++--- .../Sales/Model/Api2/Order/Rest/Admin/V1.php | 6 ++--- .../Model/Api2/Order/Rest/Customer/V1.php | 6 ++--- .../core/Mage/Sales/Model/Email/Template.php | 11 +++++++--- .../Order/Attribute/Backend/Shipping.php | 9 ++++---- .../Sales/Model/Entity/Order/Shipment.php | 9 ++++---- .../Model/Entity/Order/Shipment/Track.php | 8 +++---- .../Attribute/Frontend/Custbalance.php | 6 ++--- .../Address/Attribute/Frontend/Shipping.php | 11 +++++++--- .../Address/Attribute/Frontend/Subtotal.php | 11 +++++++--- .../Quote/Address/Attribute/Frontend/Tax.php | 11 +++++++--- .../core/Mage/Sales/Model/Entity/Setup.php | 11 +++++++--- .../Order/Attribute/Backend/Shipping.php | 12 +++++----- .../Mysql4/Order/Payment/Transaction.php | 12 +++++----- .../Sales/Model/Mysql4/Order/Shipment.php | 12 +++++----- .../Model/Mysql4/Order/Shipment/Track.php | 12 +++++----- .../Mage/Sales/Model/Mysql4/Order/Status.php | 10 ++++++--- .../Mage/Sales/Model/Mysql4/Order/Tax.php | 12 +++++----- .../Address/Attribute/Frontend/Shipping.php | 12 +++++----- .../Address/Attribute/Frontend/Subtotal.php | 12 +++++----- .../Quote/Address/Attribute/Frontend/Tax.php | 12 +++++----- .../Sales/Model/Mysql4/Report/Shipping.php | 12 +++++----- .../Report/Shipping/Collection/Shipment.php | 12 +++++----- .../core/Mage/Sales/Model/Mysql4/Setup.php | 12 +++++----- .../core/Mage/Sales/Model/Order/Api/V2.php | 6 ++--- .../core/Mage/Sales/Model/Order/Config.php | 3 --- .../Sales/Model/Order/Creditmemo/Api/V2.php | 7 +++--- .../Sales/Model/Order/Creditmemo/Config.php | 3 --- .../Model/Order/Creditmemo/Total/Shipping.php | 12 +++++----- .../Model/Order/Creditmemo/Total/Subtotal.php | 11 +++++++--- .../Model/Order/Creditmemo/Total/Tax.php | 10 ++++++--- .../Mage/Sales/Model/Order/Invoice/Api/V2.php | 6 ++--- .../Mage/Sales/Model/Order/Invoice/Config.php | 3 --- .../Model/Order/Invoice/Total/Shipping.php | 8 +++---- .../Model/Order/Invoice/Total/Subtotal.php | 11 +++++++--- .../Sales/Model/Order/Invoice/Total/Tax.php | 10 ++++++--- .../core/Mage/Sales/Model/Order/Payment.php | 4 ---- .../Sales/Model/Order/Payment/Transaction.php | 21 +++++------------- .../Mage/Sales/Model/Order/Pdf/Shipment.php | 6 ++--- .../core/Mage/Sales/Model/Order/Shipment.php | 14 ++++++------ .../Sales/Model/Order/Shipment/Api/V2.php | 6 ++--- .../Mage/Sales/Model/Order/Shipment/Track.php | 14 ++++++------ .../core/Mage/Sales/Model/Order/Status.php | 11 +++++++--- app/code/core/Mage/Sales/Model/Order/Tax.php | 13 +++++------ .../core/Mage/Sales/Model/Order/Total.php | 11 +++++++--- .../Mage/Sales/Model/Quote/Address/Total.php | 10 ++++++--- .../Model/Quote/Address/Total/Custbalance.php | 6 ++--- .../Address/Total/Nominal/Recurring/Trial.php | 10 ++++++--- .../Quote/Address/Total/Nominal/Shipping.php | 10 ++++++--- .../Quote/Address/Total/Nominal/Subtotal.php | 10 ++++++--- .../Model/Quote/Address/Total/Shipping.php | 11 +++++++--- .../Model/Quote/Address/Total/Subtotal.php | 10 ++++++--- .../Sales/Model/Quote/Address/Total/Tax.php | 11 +++++++--- .../core/Mage/Sales/Model/Resource/Order.php | 10 --------- .../Sales/Model/Resource/Order/Abstract.php | 4 ---- .../Sales/Model/Resource/Order/Address.php | 2 -- .../Resource/Order/Address/Collection.php | 8 ------- .../Order/Attribute/Backend/Shipping.php | 12 +++++----- .../Sales/Model/Resource/Order/Collection.php | 8 ------- .../Sales/Model/Resource/Order/Creditmemo.php | 6 ----- .../Resource/Order/Creditmemo/Collection.php | 8 ------- .../Resource/Order/Creditmemo/Comment.php | 6 ----- .../Order/Creditmemo/Comment/Collection.php | 8 ------- .../Order/Creditmemo/Grid/Collection.php | 8 ------- .../Order/Creditmemo/Item/Collection.php | 8 ------- .../Model/Resource/Order/Grid/Collection.php | 10 --------- .../Sales/Model/Resource/Order/Invoice.php | 6 ----- .../Resource/Order/Invoice/Collection.php | 8 ------- .../Model/Resource/Order/Invoice/Comment.php | 6 ----- .../Order/Invoice/Comment/Collection.php | 8 ------- .../Order/Invoice/Grid/Collection.php | 8 ------- .../Model/Resource/Order/Invoice/Item.php | 6 ----- .../Order/Invoice/Item/Collection.php | 8 ------- .../Mage/Sales/Model/Resource/Order/Item.php | 6 ----- .../Model/Resource/Order/Item/Collection.php | 8 ------- .../Sales/Model/Resource/Order/Payment.php | 6 ----- .../Resource/Order/Payment/Collection.php | 8 ------- .../Resource/Order/Payment/Transaction.php | 12 +++++----- .../Sales/Model/Resource/Order/Shipment.php | 22 +++++-------------- .../Resource/Order/Shipment/Collection.php | 8 ------- .../Model/Resource/Order/Shipment/Comment.php | 6 ----- .../Order/Shipment/Comment/Collection.php | 8 ------- .../Order/Shipment/Grid/Collection.php | 8 ------- .../Model/Resource/Order/Shipment/Item.php | 6 ----- .../Order/Shipment/Item/Collection.php | 8 ------- .../Model/Resource/Order/Shipment/Track.php | 18 +++++---------- .../Order/Shipment/Track/Collection.php | 8 ------- .../Sales/Model/Resource/Order/Status.php | 12 +++++----- .../Order/Status/History/Collection.php | 8 ------- .../Mage/Sales/Model/Resource/Order/Tax.php | 16 +++++--------- .../Model/Resource/Order/Tax/Collection.php | 4 ---- .../Address/Attribute/Frontend/Shipping.php | 12 +++++----- .../Address/Attribute/Frontend/Subtotal.php | 12 +++++----- .../Quote/Address/Attribute/Frontend/Tax.php | 12 +++++----- .../Resource/Quote/Address/Collection.php | 4 ---- .../Resource/Recurring/Profile/Collection.php | 4 ---- .../Sales/Model/Resource/Report/Invoiced.php | 4 ---- .../Sales/Model/Resource/Report/Order.php | 4 ---- .../Model/Resource/Report/Order/Createdat.php | 4 ---- .../Model/Resource/Report/Order/Updatedat.php | 16 +++++--------- .../Sales/Model/Resource/Report/Shipping.php | 16 +++++--------- .../Report/Shipping/Collection/Shipment.php | 16 +++++--------- .../core/Mage/Sales/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Sales/etc/adminhtml.xml | 2 +- app/code/core/Mage/Sales/etc/api.xml | 2 +- app/code/core/Mage/Sales/etc/api2.xml | 2 +- app/code/core/Mage/Sales/etc/config.xml | 2 +- app/code/core/Mage/Sales/etc/system.xml | 10 ++++----- app/code/core/Mage/Sales/etc/widget.xml | 8 +++---- .../sales_setup/upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../sales_setup/upgrade-1.6.0.1-1.6.0.2.php | 7 +++--- .../sales_setup/upgrade-1.6.0.2-1.6.0.3.php | 7 +++--- .../sales_setup/upgrade-1.6.0.3-1.6.0.4.php | 11 ++++------ .../sales_setup/upgrade-1.6.0.4-1.6.0.5.php | 7 +++--- .../sales_setup/upgrade-1.6.0.5-1.6.0.6.php | 6 ++--- .../sales_setup/upgrade-1.6.0.6-1.6.0.7.php | 6 ++--- .../sales_setup/upgrade-1.6.0.7-1.6.0.8.php | 6 ++--- .../sales_setup/upgrade-1.6.0.8-1.6.0.9.php | 7 +++--- .../sales_setup/upgrade-1.6.0.9-1.6.0.10.php | 7 +++--- app/code/core/Mage/SalesRule/Helper/Data.php | 6 ++--- .../SalesRule/Model/Mysql4/Coupon/Usage.php | 12 +++++----- .../Mage/SalesRule/Model/Resource/Coupon.php | 3 --- .../Model/Resource/Coupon/Collection.php | 4 ---- .../SalesRule/Model/Resource/Coupon/Usage.php | 16 +++++--------- .../Model/Resource/Report/Rule/Updatedat.php | 16 +++++--------- .../Model/Resource/Rule/Customer.php | 4 ---- .../Rule/Condition/Product/Subselect.php | 10 ++++++--- .../Mage/SalesRule/Model/Rule/Customer.php | 6 ++--- .../core/Mage/SalesRule/Model/Validator.php | 6 ++--- .../core/Mage/SalesRule/etc/adminhtml.xml | 2 +- app/code/core/Mage/SalesRule/etc/config.xml | 2 +- app/code/core/Mage/SalesRule/etc/system.xml | 10 ++++----- .../upgrade-1.6.0.0-1.6.0.1.php | 8 +++---- .../upgrade-1.6.0.1-1.6.0.2.php | 10 ++++----- .../upgrade-1.6.0.2-1.6.0.3.php | 6 ++--- app/code/core/Mage/Sendfriend/Helper/Data.php | 2 +- .../Mage/Sendfriend/Model/Mysql4/Setup.php | 12 +++++----- .../Sendfriend/Model/Resource/Sendfriend.php | 4 ---- .../Mage/Sendfriend/Model/Resource/Setup.php | 12 +++++----- app/code/core/Mage/Sendfriend/etc/config.xml | 2 +- app/code/core/Mage/Sendfriend/etc/system.xml | 10 ++++----- app/code/core/Mage/Shipping/Helper/Data.php | 6 ++--- .../Mage/Shipping/Model/Carrier/Tablerate.php | 14 ++++++------ .../Model/Mysql4/Carrier/Tablerate.php | 12 +++++----- .../Model/Resource/Carrier/Tablerate.php | 9 +++----- .../core/Mage/Shipping/Model/Shipping.php | 11 +++++++--- .../Shipping/Model/Tracking/Result/Status.php | 10 ++++++--- .../controllers/ShippingController.php | 10 ++++++--- .../controllers/TrackingController.php | 13 ++++------- app/code/core/Mage/Shipping/etc/adminhtml.xml | 2 +- app/code/core/Mage/Shipping/etc/config.xml | 2 +- app/code/core/Mage/Shipping/etc/system.xml | 10 ++++----- app/code/core/Mage/Sitemap/Helper/Data.php | 6 ++--- .../Mage/Sitemap/Model/Mysql4/Sitemap.php | 12 +++++----- .../Mage/Sitemap/Model/Resource/Sitemap.php | 16 +++++--------- app/code/core/Mage/Sitemap/Model/Sitemap.php | 14 ++++++------ app/code/core/Mage/Sitemap/etc/adminhtml.xml | 2 +- app/code/core/Mage/Sitemap/etc/config.xml | 2 +- app/code/core/Mage/Sitemap/etc/system.xml | 10 ++++----- .../core/Mage/Tag/Block/Customer/Tags.php | 9 ++++---- .../core/Mage/Tag/Block/Customer/View.php | 6 ++--- app/code/core/Mage/Tag/Helper/Data.php | 6 ++--- app/code/core/Mage/Tag/Model/Api/V2.php | 6 ++--- .../core/Mage/Tag/Model/Indexer/Summary.php | 18 ++++++--------- .../Mage/Tag/Model/Mysql4/Indexer/Summary.php | 12 +++++----- app/code/core/Mage/Tag/Model/Mysql4/Tag.php | 12 +++++----- .../Tag/Model/Resource/Indexer/Summary.php | 16 +++++--------- app/code/core/Mage/Tag/Model/Resource/Tag.php | 16 +++++--------- app/code/core/Mage/Tag/Model/Session.php | 8 +++---- app/code/core/Mage/Tag/Model/Tag.php | 15 ++++++------- app/code/core/Mage/Tag/etc/adminhtml.xml | 2 +- app/code/core/Mage/Tag/etc/api.xml | 2 +- app/code/core/Mage/Tag/etc/config.xml | 2 +- .../Adminhtml/Frontend/Region/Updater.php | 11 +++++++--- .../core/Mage/Tax/Block/Checkout/Shipping.php | 11 +++++----- .../core/Mage/Tax/Block/Checkout/Subtotal.php | 11 +++++----- app/code/core/Mage/Tax/Block/Checkout/Tax.php | 6 ++--- .../core/Mage/Tax/Block/Sales/Order/Tax.php | 6 ++--- app/code/core/Mage/Tax/Helper/Data.php | 6 ++--- app/code/core/Mage/Tax/Model/Calculation.php | 3 --- .../Mage/Tax/Model/Calculation/Rate/Title.php | 14 ++++++------ .../Mage/Tax/Model/Class/Source/Customer.php | 6 ++--- .../Model/Mysql4/Calculation/Rate/Title.php | 12 +++++----- .../core/Mage/Tax/Model/Mysql4/Report/Tax.php | 12 +++++----- .../Mage/Tax/Model/Mysql4/Sales/Order/Tax.php | 12 +++++----- app/code/core/Mage/Tax/Model/Mysql4/Setup.php | 12 +++++----- .../Model/Resource/Calculation/Rate/Title.php | 15 +++++-------- .../Mage/Tax/Model/Resource/Report/Tax.php | 15 +++++-------- .../Model/Resource/Report/Tax/Updatedat.php | 15 +++++-------- .../Tax/Model/Resource/Sales/Order/Tax.php | 15 +++++-------- .../core/Mage/Tax/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Tax/Model/Sales/Order/Tax.php | 14 ++++++------ .../Mage/Tax/Model/Sales/Pdf/Shipping.php | 10 +++++---- .../Mage/Tax/Model/Sales/Pdf/Subtotal.php | 10 ++++++--- .../core/Mage/Tax/Model/Sales/Pdf/Tax.php | 11 +++++++--- .../Sales/Total/Quote/Nominal/Subtotal.php | 10 ++++++--- .../Model/Sales/Total/Quote/Nominal/Tax.php | 10 ++++++--- .../Tax/Model/Sales/Total/Quote/Shipping.php | 12 +++++----- .../Tax/Model/Sales/Total/Quote/Subtotal.php | 10 ++++++--- .../Mage/Tax/Model/Sales/Total/Quote/Tax.php | 10 ++++++--- .../System/Config/Source/Tax/Display/Type.php | 10 +++++---- app/code/core/Mage/Tax/etc/adminhtml.xml | 2 +- app/code/core/Mage/Tax/etc/config.xml | 2 +- app/code/core/Mage/Tax/etc/system.xml | 10 ++++----- .../sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php | 8 +++---- .../sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php | 6 ++--- .../sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php | 8 +++---- .../sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php | 6 ++--- app/code/core/Mage/Uploader/Block/Single.php | 14 +++++++----- app/code/core/Mage/Uploader/Helper/Data.php | 6 ++--- .../Mage/Uploader/Model/Config/Uploader.php | 17 ++++++-------- app/code/core/Mage/Uploader/etc/config.xml | 2 +- .../core/Mage/Uploader/etc/jstranslator.xml | 2 +- .../Usa/Block/Adminhtml/Dhl/Unitofmeasure.php | 10 +++------ app/code/core/Mage/Usa/Helper/Data.php | 6 ++--- .../Dhl/International/Source/Method/Size.php | 6 ++--- .../Source/Method/Unitofmeasure.php | 6 ++--- .../Carrier/Dhl/Source/Protection/Value.php | 7 +++--- .../Carrier/Dhl/Source/Shipmenttype.php | 11 +++++++--- .../Carrier/Fedex/Source/Unitofmeasure.php | 6 ++--- .../Mage/Usa/Model/Shipping/Carrier/Ups.php | 9 ++++---- .../Shipping/Carrier/Ups/Backend/Type.php | 7 +++--- .../Shipping/Carrier/Ups/Source/Type.php | 10 +++++---- .../Carrier/Ups/Source/Unitofmeasure.php | 11 +++++++--- .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 8 +++---- .../Shipping/Carrier/Usps/Source/Size.php | 11 +++++++--- app/code/core/Mage/Usa/etc/config.xml | 2 +- .../Usa/etc/dhl/international/countries.xml | 2 +- app/code/core/Mage/Usa/etc/system.xml | 10 ++++----- .../sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php | 6 ++--- .../sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php | 7 +++--- .../sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php | 6 ++--- .../core/Mage/Weee/Block/Element/Weee/Tax.php | 11 +++++++--- .../Mage/Weee/Block/Renderer/Weee/Tax.php | 8 +++---- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 8 +++---- .../Mage/Weee/Model/Config/Source/Fpt/Tax.php | 12 +++++++--- .../Mysql4/Attribute/Backend/Weee/Tax.php | 12 +++++----- .../core/Mage/Weee/Model/Mysql4/Setup.php | 12 +++++----- app/code/core/Mage/Weee/Model/Mysql4/Tax.php | 12 +++++----- .../Resource/Attribute/Backend/Weee/Tax.php | 12 +++++----- .../core/Mage/Weee/Model/Resource/Setup.php | 12 +++++----- .../core/Mage/Weee/Model/Resource/Tax.php | 16 +++++--------- app/code/core/Mage/Weee/Model/Tax.php | 10 ++++++--- .../Mage/Weee/Model/Total/Creditmemo/Weee.php | 11 +++++++--- .../Mage/Weee/Model/Total/Invoice/Weee.php | 11 +++++++--- .../Weee/Model/Total/Quote/Nominal/Weee.php | 10 ++++++--- .../core/Mage/Weee/Model/Total/Quote/Weee.php | 12 +++++----- app/code/core/Mage/Weee/etc/config.xml | 2 +- app/code/core/Mage/Weee/etc/system.xml | 10 ++++----- .../Mage/Widget/Block/Adminhtml/Widget.php | 6 ++--- .../Widget/Instance/Edit/Chooser/Template.php | 12 +++++----- .../Widget/Instance/Edit/Tab/Settings.php | 12 +++++----- .../Adminhtml/Widget/Instance/Edit/Tabs.php | 16 +++++--------- .../core/Mage/Widget/Model/Mysql4/Widget.php | 12 +++++----- .../Mage/Widget/Model/Resource/Widget.php | 17 +++++--------- .../Widget/Model/Resource/Widget/Instance.php | 4 ---- .../Resource/Widget/Instance/Collection.php | 4 ---- app/code/core/Mage/Widget/Model/Widget.php | 12 +++++----- .../Adminhtml/WidgetController.php | 12 +++++----- app/code/core/Mage/Widget/etc/adminhtml.xml | 2 +- app/code/core/Mage/Widget/etc/config.xml | 2 +- .../core/Mage/Widget/etc/jstranslator.xml | 2 +- .../Mage/Wishlist/Block/Customer/Sharing.php | 6 ++--- .../Mage/Wishlist/Block/Customer/Sidebar.php | 6 ++--- .../Mage/Wishlist/Block/Customer/Wishlist.php | 6 ++--- .../Mage/Wishlist/Block/Share/Wishlist.php | 6 ++--- .../Wishlist/Model/Config/Source/Summary.php | 12 +++++++--- .../Mage/Wishlist/Model/Mysql4/Wishlist.php | 12 +++++----- .../Mage/Wishlist/Model/Resource/Item.php | 4 ---- .../Mage/Wishlist/Model/Resource/Wishlist.php | 12 +++++----- app/code/core/Mage/Wishlist/Model/Session.php | 6 ++--- .../core/Mage/Wishlist/Model/Wishlist.php | 14 ++++++------ .../Wishlist/controllers/SharedController.php | 12 +++++----- app/code/core/Mage/Wishlist/etc/config.xml | 2 +- app/code/core/Mage/Wishlist/etc/system.xml | 10 ++++----- app/code/core/Zend/Db/Select.php | 1 - app/code/core/Zend/Db/Statement.php | 1 - app/code/core/Zend/Mime.php | 2 -- 1232 files changed, 4069 insertions(+), 4667 deletions(-) diff --git a/app/code/core/Mage/Admin/Helper/Block.php b/app/code/core/Mage/Admin/Helper/Block.php index a169b689d43..2423dd0a10e 100644 --- a/app/code/core/Mage/Admin/Helper/Block.php +++ b/app/code/core/Mage/Admin/Helper/Block.php @@ -34,9 +34,6 @@ class Mage_Admin_Helper_Block */ protected $_allowedTypes; - /** - * Construct - */ public function __construct() { $this->_allowedTypes = Mage::getResourceModel('admin/block')->getAllowedTypes(); diff --git a/app/code/core/Mage/Admin/Helper/Variable.php b/app/code/core/Mage/Admin/Helper/Variable.php index 8a65e326329..193e50fd9ff 100644 --- a/app/code/core/Mage/Admin/Helper/Variable.php +++ b/app/code/core/Mage/Admin/Helper/Variable.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) */ /** @@ -34,9 +34,6 @@ class Mage_Admin_Helper_Variable */ protected $_allowedPaths; - /** - * Construct - */ public function __construct() { $this->_allowedPaths = Mage::getResourceModel('admin/variable')->getAllowedPaths(); diff --git a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php index 00a92c52c38..8c7f193d65c 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.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/User.php b/app/code/core/Mage/Admin/Model/Acl/Role/User.php index 9308a6feca9..1760a8db6b3 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/User.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/Mysql4/User.php b/app/code/core/Mage/Admin/Model/Mysql4/User.php index 6509baa14aa..9d7f4657b9b 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User.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/Resource/Block.php b/app/code/core/Mage/Admin/Model/Resource/Block.php index e0f179b684a..3b365e2b5de 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Block.php +++ b/app/code/core/Mage/Admin/Model/Resource/Block.php @@ -39,9 +39,6 @@ class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstra */ protected $disallowedBlockNames = ['install/end']; - /** - * Define main table - */ protected function _construct() { $this->_init('admin/permission_block', 'block_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles.php b/app/code/core/Mage/Admin/Model/Resource/Roles.php index 0f7baa23ac5..fe10b2dce66 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles.php @@ -41,10 +41,6 @@ class Mage_Admin_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstra */ protected $_ruleTable; - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/role', 'role_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php index 43a43f0a02a..4c19fba24ad 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User.php +++ b/app/code/core/Mage/Admin/Model/Resource/User.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) */ /** @@ -27,18 +27,12 @@ */ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/user', 'user_id'); } /** - * Initialize unique fields - * * @return $this */ protected function _initUniqueFields() diff --git a/app/code/core/Mage/Admin/Model/Resource/Variable.php b/app/code/core/Mage/Admin/Model/Resource/Variable.php index 557b40ab8b7..6b2ac4026dc 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Variable.php +++ b/app/code/core/Mage/Admin/Model/Resource/Variable.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) */ /** @@ -27,22 +27,13 @@ */ class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Cache id - */ const CACHE_ID = 'permission_variable'; - /** - * Define main table - */ protected function _construct() { $this->_init('admin/permission_variable', 'variable_id'); } - /** - * Regenerate cache - */ protected function _generateCache() { /** @var Mage_Admin_Model_Resource_Variable_Collection $collection */ diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index 9b8f0a702d0..bbb8bdf1964 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.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/Variable.php b/app/code/core/Mage/Admin/Model/Variable.php index f1787269671..e874d328efa 100644 --- a/app/code/core/Mage/Admin/Model/Variable.php +++ b/app/code/core/Mage/Admin/Model/Variable.php @@ -15,12 +15,16 @@ * @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) */ /** * Class Mage_Admin_Model_Variable * + * @category Mage + * @package Mage_Admin + * @author Magento Core Team + * * @method Mage_Admin_Model_Resource_Variable _getResource() * @method Mage_Admin_Model_Resource_Variable getResource() * @method Mage_Admin_Model_Resource_Variable_Collection getCollection() diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index 467850731a5..eca4b024e4d 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Admin * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php index 6081a70006f..a3f86f7ca44 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php index 921ee9b9576..c43b5d87640 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php index f1fda22cfad..3419e9d5146 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php index 7dc11b63c71..b7b19bd425a 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.2-1.6.1.3.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml index 6a0edf422c4..8b34a7d0508 100644 --- a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml +++ b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index de8445734bf..71e95727497 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_AdminNotification * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/etc/system.xml b/app/code/core/Mage/AdminNotification/etc/system.xml index b4cd1c29517..8b24cf06c34 100644 --- a/app/code/core/Mage/AdminNotification/etc/system.xml +++ b/app/code/core/Mage/AdminNotification/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php index b1521d329fd..c3f0492b8ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Api_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Mage_Adminhtml_Block_Api_Role_Grid_User constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php index bcd51cf7ef4..c8dc3c34255 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.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_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -39,5 +44,4 @@ public function __construct() ->assign('roles', $roles) ->assign('user_roles', $user_roles); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User.php b/app/code/core/Mage/Adminhtml/Block/Api/User.php index 239624f3e46..a299808a369 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'api_user'; diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php index f0e67aa90c6..6f5379a4c31 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php @@ -21,9 +21,9 @@ /** * Class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles * - * @category Mage - * @package Mage_Adminhtml - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team * * @method Mage_Api_Model_Resource_Role_Collection getCollection() */ diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php index 65c6225a3b2..6f0e674d8fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Api/Users.php b/app/code/core/Mage/Adminhtml/Block/Api/Users.php index 692ea8118e3..a39b4cb3d14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Users.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Users extends Mage_Adminhtml_Block_Template { - public function __construct() { parent::__construct(); @@ -43,6 +42,5 @@ public function getGridHtml() { return $this->getLayout()->createBlock('adminhtml/api_grid_user')->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php index b0fd6d96394..b379da0e0d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php @@ -15,12 +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) */ /** * Categories tree with checkboxes * + * @category Mage + * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree extends Mage_Adminhtml_Block_Catalog_Category_Tree diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php index 5c68c72e87c..b5adde16d87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index 4bc3547e55f..89a51fb988b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tree extends Mage_Adminhtml_Block_Catalog_Category_Abstract { - protected $_withProductCount; public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php index f4a790b921c..e42cc6b0527 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Form_Renderer_Attribute_Urlkey extends Mage_Adminhtml_Block_Catalog_Form_Renderer_Fieldset_Element { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php index 8638f869833..d7374be1888 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Form_Renderer_Config_YearRange extends Mage_Adminhtml_Block_System_Config_Form_Field { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $element->setStyle('width:70px;') diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php index fdb9a200f4c..35b9853aaee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Edit/Tab/System.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php index b1a018b2e45..0134c3b1083 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tab_System extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $model = Mage::registry('entity_attribute'); @@ -124,5 +122,4 @@ protected function _prepareForm() return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php index 153e4218bc0..14da87a8b35 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Attribute_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -63,5 +62,4 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php index fe06da4c675..2dbed2acd83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php index 1e7caa9a0a9..55f0332552a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Action/Attribute/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php index 55bd43e7e2b..dee72c8b2e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Alerts/Stock.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php index d0ad32b1e64..7507e33e8de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Text.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php index 45edbaada74..ded59af7663 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Text 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/Tier.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php index ea1931f7e63..9c94ea33279 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,10 +28,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Tier extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Group_Abstract { - - /** - * Initialize block - */ public function __construct() { $this->setTemplate('catalog/product/edit/price/tier.phtml'); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php index bc37987ac3c..7e46389e57c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php index 4b710d6ee2e..58c00d8e4d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Super/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php index b9f08ca3568..47acec9e352 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Super_Settings extends Mage_ { /** * Prepare block children and data - * */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php index d5e75f3c0f5..af3e198b1f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tag extends Mage_Adminhtml_Block_Widget_Grid { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php index 1840f68e45a..087326324f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Upsell extends Mage_Adminhtml_Block_Widget_Grid { - /** * Set grid params * diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php index 3df824d0472..ef5bcc61608 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Catalog_Product_Edit_Tab_Websites extends Mage_Adminh { protected $_storeFromHtml; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php index 4d112a5ab46..7b69aeebd7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Frontend/Product/Watermark.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php index da54b5b1e37..02e5ddbc12e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Weight.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php index f0eb59c1ca7..3a68a94bf27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php index c7f3783c9b3..ce8470a0fe2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php index 2d7c7862ceb..eaf79f97aed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php @@ -123,8 +123,6 @@ protected function getDeletefolderUrl() } /** - * Description goes here... - * * @return string */ public function getDeleteFilesUrl() diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php index 3ef4dd9a5bd..efa92dd2e38 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Cms_Wysiwyg_Images_Content_Uploader extends Mage_Uploader_Block_Multiple { - /** - * Uploader block constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php index 9b7dba42e87..e5c97daa153 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Wysiwyg_Images_Tree extends Mage_Adminhtml_Block_Template { - /** * Json tree builder * diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index 6b3fb29ae3b..fa36424d3af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php @@ -37,8 +37,6 @@ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region protected $_factory; /** - * Constructor for Mage_Adminhtml_Block_Customer_Edit_Renderer_Region class - * * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php index 86c4ddd50e1..d82795a8c1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Filter_Status extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected static $_statuses; public function __construct() @@ -61,5 +60,4 @@ public function getCondition() return ['eq'=>$this->getValue()]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php index 75d84ab8857..34eae6a6afa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Renderer_Status extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - protected static $_statuses; public function __construct() @@ -55,5 +54,4 @@ public static function getStatus($status) return Mage::helper('customer')->__('Unknown'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php index a9ef0c8b68c..a334514cdd9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Tag extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php index 4236d9cde25..0b749fd03ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tags extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php index 241b3d399b2..2cb07ba18b3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_View extends Mage_Adminhtml_Block_Template implements Mage_Adminhtml_Block_Widget_Tab_Interface { - protected $_customer; protected $_customerLog; diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php index 3c7eb4c5140..d83349ef81e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Customer_Edit_Tab_View_Wishlist extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Initial settings - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php index c5f244fe0d3..862a28d9c28 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index 571580367b9..a8557927bae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php index 422c7023323..36e185fc916 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Online_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { return ($row->getCustomerId() > 0 ) ? Mage::helper('customer')->__('Customer') : Mage::helper('customer')->__('Visitor') ; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php index e9916dd0083..fa6ca8791d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php index 99affcf77a5..17261be10e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/System/Config/Validatevat.php b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php index 4403e8bd3b6..8ac357e6aea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Dashboard.php index a617fa3ad01..0c5e31818b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Adminhtml - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Dashboard extends Mage_Adminhtml_Block_Template { diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php index fbce1fa9740..8a2d5db48e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Searches_Top extends Mage_Adminhtml_Block_Dashboard_Grid { protected $_collection; diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php index b08b869153b..1eafece96da 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tab_Products_Viewed extends Mage_Adminhtml_Block_Dashboard_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php index f547464e889..f22c2b13f93 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Media/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php index a9c94e4bcc6..ac1bab50015 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,17 +24,10 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team - */ - -/** * @deprecated - * Class Mage_Adminhtml_Block_Media_Uploader */ class Mage_Adminhtml_Block_Media_Uploader extends Mage_Uploader_Block_Multiple { - /** - * Constructor for uploader block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php index f61b909541b..f6f95b2b77d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,21 +25,13 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Newsletter_Subscriber extends Mage_Adminhtml_Block_Template { /** - * Queue collection - * * @var Mage_Newsletter_Model_Resource_Queue_Collection */ protected $_queueCollection = null; - /** - * Constructor - * - * Initializes block - */ public function __construct() { $this->setTemplate('newsletter/subscriber/list.phtml'); diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php index 25a38587a74..abecf889957 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Subscriber_Grid_Filter_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - protected $_websiteCollection = null; protected function _getOptions() @@ -61,5 +60,4 @@ public function getCondition() return ['in'=>$website->getStoresIds(true)]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php index da3ddb1d5b8..75f3554c2b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Template extends Mage_Adminhtml_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 70146847722..ff776421193 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php index d173bf742c0..69cd9b8aed8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +32,8 @@ class Mage_Adminhtml_Block_Notification_Toolbar extends Mage_Adminhtml_Block_Tem * */ protected function _construct() - {} + { + } /** * Retrieve helper diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 241960213b5..ec35f982124 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.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_Notification_Window extends Mage_Adminhtml_Block_Notification_Toolbar { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php index 403abe34bad..e29a7397155 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct - */ public function __construct() { $this->_controller = 'permissions_block'; 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 9ce612ff214..6a9be5cf5cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Construct - */ public function __construct() { $this->_objectId = 'block_id'; 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 268f02522b6..14b4deebdc8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Block_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index 5157f68c4a0..bae63ba1353 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -80,6 +79,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edituser', ['id' => $row->getUserId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php index 1204ebf6580..53e451c3123 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -171,6 +170,5 @@ protected function _getUsers($json=false) } } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php index dd64a9765e6..6156bd11700 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.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_Permissions_Tab_Useredit extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(); @@ -159,6 +164,5 @@ protected function _prepareForm() $this->setForm($form); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php index 4cbda45a85b..ed997c42502 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.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_Permissions_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -39,5 +44,4 @@ public function __construct() ->assign('roles', $roles) ->assign('user_roles', $user_roles); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php index 4ce02f71794..888e189f11e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'permissions_user'; @@ -37,8 +36,6 @@ public function __construct() } /** - * Prepare output HTML - * * @return string */ protected function _toHtml() diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php index bdf14eb2369..791fa4afaf5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index cc9089d3633..00e51f58937 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.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_Block_Permissions_UsernRoles extends Mage_Adminhtml_Block_Template { - - public function __construct() { + public function __construct() + { parent::__construct(); $userCollection = Mage::getModel("permissions/users")->getCollection()->load(); $rolesCollection = Mage::getModel("permissions/roles")->getCollection()->load(); @@ -29,5 +35,4 @@ public function __construct() { ->assign('users', $userCollection) ->assign('roles', $rolesCollection); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php index fcc68f45101..dec64fd3365 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Users extends Mage_Adminhtml_Block_Template { - public function __construct() { parent::__construct(); @@ -43,6 +42,5 @@ public function getGridHtml() { return $this->getLayout()->createBlock('adminhtml/permissions_grid_user')->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php index 5971c7d8a1b..a36170ff2dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct - */ public function __construct() { $this->_controller = 'permissions_variable'; 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 bcf9cc56e50..6418a27c12e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php @@ -27,9 +27,6 @@ */ class Mage_Adminhtml_Block_Permissions_Variable_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Construct - */ public function __construct() { $this->_objectId = 'variable_id'; diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php index 6cd57468da5..78e8daf1683 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); 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 fbcb692bf5a..1cf8f1fe608 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 @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php index 4c958fbca39..e6b32d7c134 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php index 46bef5f489c..57d1b3c6f3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php @@ -15,20 +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) */ /** - * description - * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Catalog_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); 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 32b8905a22e..663a924ff0a 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 @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php index 6dd29ea1556..21430dfce0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php index f3698b79813..cbd7d6a942c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php index 5bd6543b8e7..24b54acb75c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php @@ -15,20 +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) */ /** - * description - * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Promo_Quote_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php index 5fdf070d556..cda682a613b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Rating/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php index 953353c3d9d..26f85ed73dd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -44,14 +43,7 @@ protected function _beforeToHtml() 'content' => $this->getLayout()->createBlock('adminhtml/rating_edit_tab_form')->toHtml(), ]) ; -/* - $this->addTab('answers_section', array( - 'label' => Mage::helper('rating')->__('Rating Options'), - 'title' => Mage::helper('rating')->__('Rating Options'), - 'content' => $this->getLayout()->createBlock('adminhtml/rating_edit_tab_options') - ->append($this->getLayout()->createBlock('adminhtml/rating_edit_tab_options')) - ->toHtml(), - ));*/ + return parent::_beforeToHtml(); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php index c7fedc6d012..a256522ba14 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -19,8 +19,6 @@ */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php index 4ba8b3e8ca7..cadfb35bedf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Config_Form_Field_YtdStart extends Mage_Adminhtml_Block_System_Config_Form_Field { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $_months = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php index f5a04d0c030..4c4ca5eca94 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Customer_Totals extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php index 4a3704d6d02..00f0efe6f2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Sold.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php index 431ffe37497..c6c8cef0b63 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sold extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php index bea7e0b0249..42fd2557c0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Viewed extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php index ab1f7c28d94..66e7ac7ceeb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Refresh_Statistics extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php index 4709018b5a1..e8e10653646 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Shipping extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php index 9867370b207..0c8414d8b74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tax extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php index d380fe23330..9b2f438aba2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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 extends Mage_Adminhtml_Block_Template { - public $wishlists_count; public $items_bought; public $shared_count; @@ -57,5 +56,4 @@ public function _beforeToHtml() return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php index 28698eff859..2f281d56473 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { protected function _getOptions() diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php index de830e81e60..66d21a55589 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php index 38f995d4ed0..89fa6da39a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Summary extends Mage_Adminhtml_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php index eb953c33ae2..1902d618cb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php index cb39f83a1b9..06127037a95 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sidebar extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { protected function _prepareLayout() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php index 11c03527a78..a1f3cf2edf5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Create_Sidebar_Viewed extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { - protected function _construct() { parent::_construct(); @@ -59,5 +58,4 @@ public function getHeaderText() { return Mage::helper('sales')->__('Recently Viewed'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php index 58ebbefdd42..cd7783f006f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Store.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php index 05b2c8b928e..cd661b5a071 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Store 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/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php index abd0bd555bb..756d1179452 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Totals extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { protected $_totalRenderers; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php index b1e16044324..d077bc26262 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.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_Shipping extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php index a6fd21a61cb..9e7031bd924 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.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) */ /** * 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_Subtotal extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php index 94485c09454..e6d566af9f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Totals_Table extends Mage_Adminhtml_Block_Template { - protected $_websiteCollection = null; public function __construct() @@ -36,5 +34,4 @@ public function __construct() parent::__construct(); $this->setId('sales_order_create_totals_table'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php index c78e3ca1e28..ba3bcb287f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.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) */ /** * Tax Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Order_Create_Totals_Tax extends Mage_Adminhtml_Block_Sales_Order_Create_Totals_Default { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php index 41b2958e2f5..c9697aec277 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Creditmemo/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php index 005bb14040a..924629de361 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Create/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php index e08a637cb61..a017233d321 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php index 69ac013d0b7..fa8065b96d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php index 1bbb9c96460..536988732f3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php index d419712fc24..198c0bec35c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php index eaade37892c..fa8704013c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php index 296c3078ecf..08cb3af1d92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php index c4ae47ab076..8d36de5c4de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Totalbar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php index 5d2ac672014..0475777b8ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Totalbar extends Mage_Adminhtml_Block_Sales_Order_Abstract { protected $_totals = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php index fc6b3692e4c..73f3673bec7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Totals/Tax.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php index 1b7a2d9cfc3..daa70c8754c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php index f74ab1602fc..5bb49d77a27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Shipments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php index dd839937418..95c416793a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Transactions.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php index 3c2330d9068..1ca471937dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php index 13d44efd69d..fde493d4202 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php index ba975a2d871..434fbd47611 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Shipment extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'sales_shipment'; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php index 1168962f512..76deeffa9ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.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_Totals extends Mage_Sales_Block_Order_Totals { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php index 23d6bf49d69..6f297b51e39 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Sitemap.php index 58a452985ad..a5738a4c397 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sitemap + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** * Block constructor */ @@ -37,5 +37,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('sitemap')->__('Add Sitemap'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php index a2590fbc7d7..1a353a8d533 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sitemap + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Time extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index b7e9019af90..caebfca8c71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Fieldset/Order/Statuses.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php index e12f6673f78..2b2b4e4bbbf 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.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_Order_Statuses extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { @@ -77,5 +82,4 @@ protected function _getFieldHtml($fieldset, $id, $status) return $field->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php index 198e9526c51..404115b0432 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.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_Switcher extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php index 21740ef1042..223aeafb88a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index db07b5c4330..20b28b7570d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_System_Config_Tabs extends Mage_Adminhtml_Block_Widget { /** - * Tabs - * * @var array */ protected $_tabs; diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php index 8e4a5a3f6a7..b5405d00742 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Upload extends Mage_Adminhtml_Block_Widget_Form { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php index 3b4cc204f80..ac93e907b38 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php index b9e5aa52664..bf982630a27 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Edit_Tab_Wizard extends Mage_Adminhtml_Block_Widget_Container { - protected $_storeModel; protected $_attributes; protected $_addMapButtonHtml; @@ -226,6 +225,5 @@ public function getShortDateFormat() } return $this->_shortDateFormat; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php index 25db178c071..125d7ea86cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_System_Convert_Gui_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tabs constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php index a7956b633ad..e5252efef9c 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_System_Convert_Profile_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tabs constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php index bac2595e1ee..9f7e538f4ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php index 458a2495616..82499cc554f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php index 4235c2db08c..c76ee215cbd 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,12 +25,10 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Email_Template extends Mage_Adminhtml_Block_Template { /** * Set transactional emails grid template - * */ protected function _construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php index a939f249213..f1c2b2ba847 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php index 51babf7a194..c9ff9aef92a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php index d29da72123f..f3a165e73d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Website extends Mage_Adminhtml_Block_Template { - protected function _prepareLayout() { $itemId = $this->getRequest()->getParam('website_id'); @@ -61,5 +60,4 @@ protected function _prepareLayout() ); return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php index 31ba4208963..f2d5d86913a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php index e55907e2a16..e16ef5bf66b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,16 +26,13 @@ * @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_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { return '' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . ''; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php index 73c4f4f384c..ab9d883815d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Store extends Mage_Adminhtml_Block_Widget_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php index d2556111d23..b52d3986ed1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Variable.php b/app/code/core/Mage/Adminhtml/Block/System/Variable.php index 11ad214a98b..ed1a5304ff0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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,12 +25,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Variable extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Block constructor - */ public function __construct() { $this->_controller = 'system_variable'; diff --git a/app/code/core/Mage/Adminhtml/Block/Tag.php b/app/code/core/Mage/Adminhtml/Block/Tag.php index de51f353196..463cb341390 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php index ddf5792a731..34cb7a014e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php index 954f2273f6c..3cfb6e52f48 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Tag extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'tag_tag'; diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php index 4dd29bb0124..b2ecef91ac9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.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) */ /** * Tax Rate Titles Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Tax_Rate_Title extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php index d71f3fa1e3d..c620ad9f767 100644 --- a/app/code/core/Mage/Adminhtml/Block/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php index 0a45ab1866e..dd2f1472f81 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index 80f9fd088c3..594dc195e1a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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.php b/app/code/core/Mage/Adminhtml/Block/Widget.php index 2ea12319960..48b4f2c25e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php index 273935a7f5f..9b914f111f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Widget_Grid_Column_Filter_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract { - /** * Render HTML of the element * @@ -107,5 +106,4 @@ public function getCondition() return ['eq' => $this->getValue()]; } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php index 7b0eeb8a8eb..7c5389e221f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php index d2f144c99a1..12f1c62b605 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Theme.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Renderer/Store.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php index 2fdb444cb7f..45cbc57c247 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php index 5190fa392a5..420deb6afd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Text extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php index dadd926eef4..caf1762a076 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Theme.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Renderer/Wrapline.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php index 7c07e196536..cb3aaf6e523 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Wrapline.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php index a5fd32deb04..13b71831a0b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.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) */ /** - * Tabs block - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team @@ -28,8 +26,6 @@ class Mage_Adminhtml_Block_Widget_Tabs extends Mage_Adminhtml_Block_Widget { /** - * tabs structure - * * @var array */ protected $_tabs = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php index d6a0b4a01a8..9c270c1bf52 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.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_Tree extends Mage_Adminhtml_Block_Template { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php index 77a9b0dba43..6eecd8365cf 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.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) */ /** * Adminhtml sales orders controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Controller_Sales_Shipment extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/Model/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/Email/Template.php index ca74672d99d..1412742d747 100644 --- a/app/code/core/Mage/Adminhtml/Model/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/Email/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_Email_Template extends Mage_Core_Model_Email_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php index 65569ddc438..c29aab60bdd 100644 --- a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,9 +67,6 @@ class Mage_Adminhtml_Model_LayoutUpdate_Validator extends Zend_Validate_Abstract */ protected $_protectedExpressions = []; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php index 1ddb4e54ec0..34fc4600b30 100644 --- a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_Newsletter_Renderer_Text implements Varien_Data_Form_Element_Renderer_Interface { - public function render(Varien_Data_Form_Element_Abstract $element) { $html = ''."\n"; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php index afb210faab9..4736f70f4da 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustom.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Admin/Usecustompath.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php index cbc3b8e6b0a..a6e074ff124 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usecustompath.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Admin/Usesecretkey.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php index 8e67743c71c..10ffd254c64 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Usesecretkey.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php index 27915899eb2..d612565b221 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Address/Street.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php index c4d5cd98462..8d612946404 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Address/Street.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php index 6701abb4a03..296203aa1fe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale/Timezone.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php index 0cb123675ab..f03eb7bf151 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Shipping/Tablerate.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_System_Config_Backend_Shipping_Tablerate extends Mage_Core_Model_Config_Data { public function _afterSave() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php index 2f3d681ec6d..7372905da84 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap.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_Sitemap extends Mage_Core_Model_Config_Data { - protected function _beforeSave() { $value = $this->getValue(); @@ -31,5 +35,4 @@ protected function _beforeSave() } return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php index 95d6fb5095c..5a89940fe17 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Symlink.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php index 4fa10419b1b..fba9fed24ab 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php @@ -15,14 +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) */ /** * System config symlink backend model * - * @category Mage - * @package Mage_Adminhtml + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Backend_Symlink extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php index 03616e280e0..ccfff30edd0 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Translate.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Catalog/Search/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php index 2f276d98723..d9d41a9a483 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Catalog/TimeFormat.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php index 41fc2502484..b3ba5fa77a1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/TimeFormat.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_Catalog_TimeFormat { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php index c04640105e5..3cffe9aeb4f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Address/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Date/Short.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php index fd68ce29f1d..2dbc265b208 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Date/Short.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_Date_Short { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php index bf44985e92a..eeecec83a81 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.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_Email_Smtpauth { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php index a3a190541a0..51656965257 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Template.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Locale/Timezone.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php index d1f48999797..4023b64486c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Timezone.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) */ /** * Locale timezone source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale_Timezone { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php index 6bc84c2ffdd..7b965a32c64 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdaycodes.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) */ /** * Locale weekdays source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdaycodes { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php index c365f20d1c4..93bf69f3c74 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Weekdays.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) */ /** * Locale timezone source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale_Weekdays { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php index ab1c6e30a86..46f544aab53 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.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) */ /** * Order Statuses source model + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Order_Status { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php index 8ede3ee2751..2fede8367f8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Step.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_Price_Step { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php index c9cf72614ee..0ea0b81ec83 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Product/Thumbnail.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php index 01bbedd062c..11f7f985c0e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Thumbnail.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_System_Config_Source_Product_Thumbnail { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php index d44cf8455a3..c42d0d4e83e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.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_Tablerate { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php index e78a484b139..fcd78c287ca 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Taxclass.php @@ -15,13 +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_Shipping_Taxclass { public function toOptionArray() { - //array_unshift($options, array('value'=>'', 'label' => Mage::helper('tax')->__('None'))); return Mage::getModel('tax/class_source_product')->toOptionArray(); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php index 54a5aff552f..962bec65072 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php @@ -15,17 +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) */ /** * Generate options for media storage selection + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Storage_Media_Storage { /** - * Options getter - * * @return array */ public function toOptionArray() @@ -41,5 +43,4 @@ public function toOptionArray() ] ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php index 7897a9ecb10..5c98109ca77 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Store.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_Store { protected $_options; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php index 6cd7fa0d410..9b78c1f7b51 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Website.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_Website { protected $_options; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php index a3ed3b1dc95..244df0ec907 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesno.php @@ -15,19 +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) */ /** * Used in creating options for Yes|No config value selection * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Yesno { - /** - * Options getter - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php index 8da5347395b..20a1a715a02 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Yesnocustom.php @@ -15,19 +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) */ /** * Used in creating options for Yes|No|Specified config value selection * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Yesnocustom { - /** - * Options getter - * * @return array */ public function toOptionArray() @@ -38,5 +38,4 @@ public function toOptionArray() ['value' => 2, 'label'=>Mage::helper('adminhtml')->__('Specified')] ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php index 6c2c62fc8c8..d0120d58a00 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Model_System_Store extends Varien_Object { - /** * Website collection * websiteId => Mage_Core_Model_Website diff --git a/app/code/core/Mage/Adminhtml/Model/Url.php b/app/code/core/Mage/Adminhtml/Model/Url.php index ccdf95c8c9a..92a877a095c 100644 --- a/app/code/core/Mage/Adminhtml/Model/Url.php +++ b/app/code/core/Mage/Adminhtml/Model/Url.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_Url extends Mage_Core_Model_Url { diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index eedfd51494a..446fdfb2051 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.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_Api_UserController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php index a632fd33ca4..f1f718f211f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php index 9c96b851623..e9d2e914be0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php index 0d47433f0a0..b14b4763904 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Cms/Block/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php index 0071f2ed820..c49745378d7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Cms/Page/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php index fb327e79276..fbb678d0d3b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Cms/WysiwygController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php index 83f426962cb..2c7c2f656e9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/System/Config/ValidatevatController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php index d33684f956c..04fd77cbefe 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Wishlist/Product/Composite/WishlistController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php index 7e2bda773a3..20f6b7308d9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/UploaderController.php b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php index 6dd6ea92538..2cb4b17c668 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Newsletter/SubscriberController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php index 59e0911348c..41e376b22b9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Newsletter/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php index 669f219e489..46602d02636 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Manage Newsletter Template Controller @@ -31,7 +31,7 @@ class Mage_Adminhtml_Newsletter_TemplateController extends Mage_Adminhtml_Contro * * @return bool */ - protected function _isAllowed () + protected function _isAllowed() { return Mage::getSingleton('admin/session') ->isAllowed('newsletter/template'); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index e39d67a0e25..3cecb277236 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.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_Permissions_UserController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php index 53c57972d51..4bb355027c5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index e71be08052b..7d768ca9940 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.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_Promo_WidgetController extends Mage_Adminhtml_Controller_Action { /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index 8f0276afdf2..57287950561 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Report/StatisticsController.php b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php index 4ae00c23f10..e456bbeb1e0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Report/TagController.php b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php index 0b0b0f22caa..9ef42891d7b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index 6dd095e8dcb..744dab5fef1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/StatusController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php index 426bd3e637e..4f336ed639c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php index 3d4c76b396d..a6bf11334d4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.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) */ /** * Adminhtml sales orders controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Sales_ShipmentController extends Mage_Adminhtml_Controller_Sales_Shipment { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php index d9ef67197d5..8401b70c947 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.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) */ /** * Adminhtml sales transactions controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Sales_TransactionsController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index 4ed70d938b4..6778d65520a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_Sitemap + * @author Magento Core Team */ class Mage_Adminhtml_SitemapController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php index ea8306cfbb7..c1bbfe6936e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/Email/TemplateController.php b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php index fdf7a3acb45..5e0ca4720e9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/StoreController.php b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php index 091f3dab16d..0e743d6d5c6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -504,6 +504,5 @@ protected function _addDeletionNotice($typeTitle) ); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php index c48f964595a..561fbef304f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/SystemController.php b/app/code/core/Mage/Adminhtml/controllers/SystemController.php index 4588d51a86c..153f4a967f5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 22dde0a2d06..165f5944d9a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_TagController extends Mage_Adminhtml_Controller_Action { - protected function _initAction() { $this->loadLayout() diff --git a/app/code/core/Mage/Adminhtml/controllers/TaxController.php b/app/code/core/Mage/Adminhtml/controllers/TaxController.php index e915f31eed7..142c34dc75e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TaxController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/UrlrewriteController.php b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php index bc2c92f8ff7..644f2673ba0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -15,7 +15,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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/etc/adminhtml.xml b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml index d6a3eb61ab7..9963688907a 100644 --- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml +++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 8cd7aef93c8..b5f1a47694d 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml b/app/code/core/Mage/Adminhtml/etc/jstranslator.xml index 0448a7e3086..c7df21aeda1 100644 --- a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml +++ b/app/code/core/Mage/Adminhtml/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Adminhtml * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php index f96a21c2e9b..a506589c2d4 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.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,7 +23,7 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface { diff --git a/app/code/core/Mage/Api/Model/Acl/Role/User.php b/app/code/core/Mage/Api/Model/Acl/Role/User.php index fbd1c879cd3..19c900d9244 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/User.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_User extends Mage_Api_Model_Acl_Role_Generic { - } diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php index 6e026c13de7..1410b03073f 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User.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_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) */ /** * ACL user resource * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team * @deprecated */ class Mage_Api_Model_Mysql4_User extends Mage_Api_Model_Resource_User diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php index c39549046f8..b3a4c52a372 100644 --- a/app/code/core/Mage/Api/Model/Resource/User.php +++ b/app/code/core/Mage/Api/Model/Resource/User.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_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) */ /** * ACL user resource * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team */ class Mage_Api_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('api/user', 'user_id'); diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 8a3394c6a51..903381f3204 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.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/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index 2969e3ecdd6..243f6d55aeb 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.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/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php index 31c39ffe3c1..6e7921e61cf 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.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/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php index 9de8200f638..e92e0063dd4 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.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/User.php b/app/code/core/Mage/Api/Model/User.php index 59601aa2030..5a7074c248d 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.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_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 model * + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_User _getResource() * @method Mage_Api_Model_Resource_User getResource() * @method string getFirstname() @@ -56,33 +60,22 @@ * @method array getRoleIds() * @method $this setLogdate(string $value) * - * @category Mage - * @package Mage_Api - * @author Magento Core Team - * * @method $this setRoleIds(array $value) * @method $this setRoleUserId(int $value) */ class Mage_Api_Model_User extends Mage_Core_Model_Abstract { /** - * Prefix of model events names - * * @var string */ protected $_eventPrefix = 'api_user'; - /** - * Constructor - */ protected function _construct() { $this->_init('api/user'); } /** - * Save user - * * @return $this */ public function save() diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php index e957bd98a55..e19e26f93c5 100644 --- a/app/code/core/Mage/Api/controllers/SoapController.php +++ b/app/code/core/Mage/Api/controllers/SoapController.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/controllers/V2/SoapController.php b/app/code/core/Mage/Api/controllers/V2/SoapController.php index 4b1120509cc..be3b852227a 100644 --- a/app/code/core/Mage/Api/controllers/V2/SoapController.php +++ b/app/code/core/Mage/Api/controllers/V2/SoapController.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/controllers/XmlrpcController.php b/app/code/core/Mage/Api/controllers/XmlrpcController.php index 1fa793f5c00..219eaae92e2 100644 --- a/app/code/core/Mage/Api/controllers/XmlrpcController.php +++ b/app/code/core/Mage/Api/controllers/XmlrpcController.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/etc/adminhtml.xml b/app/code/core/Mage/Api/etc/adminhtml.xml index 37fd21b13ba..f8a62b1e03a 100644 --- a/app/code/core/Mage/Api/etc/adminhtml.xml +++ b/app/code/core/Mage/Api/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/api.xml b/app/code/core/Mage/Api/etc/api.xml index 610fbe99087..a8283760156 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index b4a80e9930b..2ab15aeb9ab 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/etc/system.xml b/app/code/core/Mage/Api/etc/system.xml index 06ed95b6369..90ae8fa42f6 100644 --- a/app/code/core/Mage/Api/etc/system.xml +++ b/app/code/core/Mage/Api/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php index 62e0629497f..464623716e7 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct grid container - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php index 1996fc98f81..9cf5f6d60f6 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Attribute_Buttons extends Mage_Adminhtml_Block_Template { - /** - * Construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php index 1e8a8a653a9..163adfbb017 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.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) */ /** @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Attribute_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php index 3332b4b0b5a..18dc2ee8911 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** - * Construct grid container - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php index 4a201eb2f07..ebf1e13c510 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php @@ -30,9 +30,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles_Buttons extends Mage_Adminhtml_Block_Template { - /** - * Construct - */ public function __construct() { parent::__construct(); 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 035f387b7cf..40809c16d67 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php @@ -27,9 +27,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles_Grid extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Construct grid block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php index f098dc4385c..1c3f3fb6e3e 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.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_Users setRole(Mage_Api2_Model_Acl_Global_Role $role) * @method Mage_Api2_Block_Adminhtml_Roles_Tab_Users setUsers(array $users) @@ -31,9 +32,6 @@ */ class Mage_Api2_Block_Adminhtml_Roles_Tab_Users extends Mage_Adminhtml_Block_Widget_Grid implements Mage_Adminhtml_Block_Widget_Tab_Interface { - /** - * Construct grid block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php index 64e513b98e3..9b150ae4cb3 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.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,15 +24,12 @@ * @category Mage * @package Mage_Api2 * @author Magento Core Team + * * @method Mage_Api2_Block_Adminhtml_Roles_Tabs setRole(Mage_Api2_Model_Acl_Global_Role $role) * @method Mage_Api2_Model_Acl_Global_Role getRole() */ class Mage_Api2_Block_Adminhtml_Roles_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php index fd53ce42858..a439457d80e 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.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.php b/app/code/core/Mage/Api2/Model/Auth/User.php index 52b5cbf36ab..e6318b434eb 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User.php +++ b/app/code/core/Mage/Api2/Model/Auth/User.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_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) */ /** * API auth user * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Auth_User { diff --git a/app/code/core/Mage/Api2/Model/Renderer/Xml.php b/app/code/core/Mage/Api2/Model/Renderer/Xml.php index a7cf5537c78..8b69d59549d 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml.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/Renderer/Xml/Writer.php b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php index b578e39140a..09c3077c6d6 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.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/Request/Interpreter/Xml.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php index 86cf45d24de..febaa8a0ba3 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.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_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) */ /** * Request content interpreter XML adapter * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Request_Interpreter_Xml implements Mage_Api2_Model_Request_Interpreter_Interface { diff --git a/app/code/core/Mage/Api2/Model/Resource/Setup.php b/app/code/core/Mage/Api2/Model/Resource/Setup.php index c848dd2e2c1..c43b6c6fd98 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Setup.php +++ b/app/code/core/Mage/Api2/Model/Resource/Setup.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_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) */ /** * API2 setup model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator.php b/app/code/core/Mage/Api2/Model/Resource/Validator.php index 33452694330..6808aa234c2 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator.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/etc/adminhtml.xml b/app/code/core/Mage/Api2/etc/adminhtml.xml index 16c1a36c765..c7e5842c243 100644 --- a/app/code/core/Mage/Api2/etc/adminhtml.xml +++ b/app/code/core/Mage/Api2/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api2/etc/config.xml b/app/code/core/Mage/Api2/etc/config.xml index 7f482ebaae8..5efd801b773 100644 --- a/app/code/core/Mage/Api2/etc/config.xml +++ b/app/code/core/Mage/Api2/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Api2 * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php index fb3c6a1d92f..42264c36b7e 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.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/etc/config.xml b/app/code/core/Mage/Authorizenet/etc/config.xml index b1e2bfafb6b..15e61f639dc 100644 --- a/app/code/core/Mage/Authorizenet/etc/config.xml +++ b/app/code/core/Mage/Authorizenet/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Authorizenet * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Authorizenet/etc/system.xml b/app/code/core/Mage/Authorizenet/etc/system.xml index 9ee29dae61b..8e9645dc848 100644 --- a/app/code/core/Mage/Authorizenet/etc/system.xml +++ b/app/code/core/Mage/Authorizenet/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php index 2068d8fb1e0..7e2c7472c35 100644 --- a/app/code/core/Mage/Backup/Helper/Data.php +++ b/app/code/core/Mage/Backup/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Backup - * @author Magento Core Team + * @category Mage + * @package Mage_Backup + * @author Magento Core Team */ class Mage_Backup_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Backup/Model/Config/Source/Type.php b/app/code/core/Mage/Backup/Model/Config/Source/Type.php index e8c4455be95..7d085fc7713 100644 --- a/app/code/core/Mage/Backup/Model/Config/Source/Type.php +++ b/app/code/core/Mage/Backup/Model/Config/Source/Type.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_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) */ /** diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml index 6d76a915b9b..46465d681aa 100644 --- a/app/code/core/Mage/Backup/etc/adminhtml.xml +++ b/app/code/core/Mage/Backup/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index 2dcbbedafb1..1c2252d5d7c 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Backup * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/etc/system.xml b/app/code/core/Mage/Backup/etc/system.xml index 9970d5559ad..5fc08afeea1 100644 --- a/app/code/core/Mage/Backup/etc/system.xml +++ b/app/code/core/Mage/Backup/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php index 4ed8e1423d2..4f9deecd99c 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.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 Special Price Attribute Block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method $this setDisableChild(bool $value) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php index c00e298983d..ec5b9e0c2e0 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.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) */ /** * Adminhtml product edit tabs * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tabs extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php index 6b17e3092a3..423cb5e5b5f 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.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) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php index ff37c1ae623..7fa0ec1310d 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.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 Stock Status Indexer 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_Indexer_Stock extends Mage_Bundle_Model_Resource_Indexer_Stock diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php index fd987646efd..0849dec664a 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.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 Price View Attribute Renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Product_Attribute_Source_Price_View extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 08eac48abac..0ce895f0952 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.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 Type Model * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Product_Type extends Mage_Catalog_Model_Product_Type_Abstract { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php index 1b379ccdee8..385f56539c0 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.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 Stock Status Indexer 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_Indexer_Stock extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option.php b/app/code/core/Mage/Bundle/Model/Resource/Option.php index 2ff33435082..a826acf68d3 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option.php @@ -27,18 +27,12 @@ */ class Mage_Bundle_Model_Resource_Option extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource - * - */ protected function _construct() { $this->_init('bundle/option', 'option_id'); } /** - * After save process - * * @param Mage_Core_Model_Abstract|Mage_Bundle_Model_Option $object * @return $this */ 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 ed4aff38f52..90e0835ff3c 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php @@ -48,9 +48,6 @@ class Mage_Bundle_Model_Resource_Price_Index extends Mage_Core_Model_Resource_Db */ protected $_customerGroups; - /** - * Initialize connection and define main table - */ protected function _construct() { $this->_init('bundle/price_index', 'entity_id'); diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection.php index b64da262901..c2f7867e0da 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection.php @@ -27,10 +27,6 @@ */ class Mage_Bundle_Model_Resource_Selection extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and id field - * - */ protected function _construct() { $this->_init('bundle/selection', 'selection_id'); diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php index 8aeeea9682c..8e85fdfb0ed 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.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) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php index 47874614e07..0c3dc6dc3a7 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.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) */ /** diff --git a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php index 527c37c1a85..465278f65dc 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.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) */ /** diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 19dac6b3fbf..010b11ba40f 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Bundle * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 35493640928..d55e1ffc0fb 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.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_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) */ /** @var Mage_Catalog_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php index 7e69ae9d3a4..d3f384e4f79 100644 --- a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php +++ b/app/code/core/Mage/Captcha/Block/Captcha/Zend.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/Resource/Log.php b/app/code/core/Mage/Captcha/Model/Resource/Log.php index 8b907fee3ba..c491fc60423 100644 --- a/app/code/core/Mage/Captcha/Model/Resource/Log.php +++ b/app/code/core/Mage/Captcha/Model/Resource/Log.php @@ -37,10 +37,6 @@ class Mage_Captcha_Model_Resource_Log extends Mage_Core_Model_Resource_Db_Abstra */ const TYPE_LOGIN = 2; - /** - * Define main table - * - */ protected function _construct() { $this->_setMainTable('captcha/log'); diff --git a/app/code/core/Mage/Captcha/Model/Zend.php b/app/code/core/Mage/Captcha/Model/Zend.php index 7733aacdc53..de983173ca9 100644 --- a/app/code/core/Mage/Captcha/Model/Zend.php +++ b/app/code/core/Mage/Captcha/Model/Zend.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/etc/config.xml b/app/code/core/Mage/Captcha/etc/config.xml index ca9b1944974..247afc28c82 100644 --- a/app/code/core/Mage/Captcha/etc/config.xml +++ b/app/code/core/Mage/Captcha/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Captcha * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Captcha/etc/system.xml b/app/code/core/Mage/Captcha/etc/system.xml index 5a18b82c5a6..64848c2a42c 100644 --- a/app/code/core/Mage/Captcha/etc/system.xml +++ b/app/code/core/Mage/Captcha/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Captcha - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Captcha + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php index e083f46452c..e312882e584 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.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_Category_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Catalog/Block/Layer/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index 2e87ad466c1..2f83c3d92a3 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.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/Layer/View.php b/app/code/core/Mage/Catalog/Block/Layer/View.php index a5370a58a81..edbc311622a 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/View.php +++ b/app/code/core/Mage/Catalog/Block/Layer/View.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 layered navigation view block * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Layer_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php index a2ee128840c..a3c1019ca96 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.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/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php index 819f7e07139..d7a95c96a42 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.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 list toolbar * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method string getDefaultGridPerPage() * @method string getDefaultListPerPage() diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php index 32357aa4467..d5492c5a139 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.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,9 +23,8 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Catalog_Block_Product_List_Upsell extends Mage_Catalog_Block_Product_Abstract { /** diff --git a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php b/app/code/core/Mage/Catalog/Block/Product/Price/Template.php index 7886429c9e5..a785fe2aba9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price/Template.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 Price Template Block * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Product_Price_Template extends Mage_Core_Block_Abstract { diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php index 36e79c5557a..b7ba6988e95 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -12,19 +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 View block * - * @category Mage - * @package Mage_Catalog - * @module Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method int getProductId() * @method $this setCustomAddToCartUrl(string $value) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php index a5dfb733010..39b53fa6f8b 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.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,7 +27,6 @@ */ class Mage_Catalog_Block_Product_View_Options_Type_Text extends Mage_Catalog_Block_Product_View_Options_Abstract { - /** * Returns default value to show in text input * diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php index 535370477e7..49339442ea2 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.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/Simple.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php index c45f9b4c99c..801ff281ffa 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.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_Simple extends Mage_Catalog_Block_Product_View_Abstract { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php index 8cf51accdac..1ee78f2d074 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.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,9 +23,8 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Product_View_Type_Virtual extends Mage_Catalog_Block_Product_View_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index f6002fd2f2f..0dd27819814 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.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/Product/View.php b/app/code/core/Mage/Catalog/Helper/Product/View.php index 1959906f982..7d0dae1b040 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/View.php +++ b/app/code/core/Mage/Catalog/Helper/Product/View.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 category helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Helper_Product_View extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php index a6236759a72..c17d8a23601 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.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/Category/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php index 3c5683fa995..c7321137fdb 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.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/Category/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php index 063098c86f1..c228428592c 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.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/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php index ee91e1c9503..aa4148def29 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.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/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php index f3f83eda8b2..accb10def65 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.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/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php index 298b095fa6a..c79bfbe95cb 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.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/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php index 94725fd4e0e..d175876f169 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.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/Rest/Customer/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php index 39cbd067936..a485ca248cd 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.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/Rest/Guest/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php index 975ab084346..b8466dbe549 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.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/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php index 47a1138b2fc..a25f098675f 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.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/Website/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php index 25c51bd9aee..0930e2d38ce 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.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/Website/Validator/Admin/Website.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php index 91c4ce5ec62..7143e07a204 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.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/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php index 0bee70c4127..2dacd827736 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.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/Category/Attribute/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php index f410403cb86..bf7267f39eb 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.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/Category/Attribute/Backend/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php index f62c317b949..16a819fc549 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.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/Category/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php index 4eeca6765cb..c2ce2b7e91a 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.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_Model_Category_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php index 5bcdf254287..1b799c9e46d 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.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/Category/Url.php b/app/code/core/Mage/Catalog/Model/Category/Url.php index cc492ab2686..35157375fa6 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Url.php +++ b/app/code/core/Mage/Catalog/Model/Category/Url.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/Convert/Adapter/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php index 37a882a7cff..89fd79f97fc 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php @@ -32,11 +32,6 @@ class Mage_Catalog_Model_Convert_Adapter_Product extends Mage_Eav_Model_Convert_ const MULTI_DELIMITER = ' , '; const ENTITY = 'catalog_product_import'; - /** - * Event prefix - * - * @var string - */ protected $_eventPrefix = 'catalog_product_import'; /** diff --git a/app/code/core/Mage/Catalog/Model/Indexer/Url.php b/app/code/core/Mage/Catalog/Model/Indexer/Url.php index 51135184b93..6a95fa77c49 100644 --- a/app/code/core/Mage/Catalog/Model/Indexer/Url.php +++ b/app/code/core/Mage/Catalog/Model/Indexer/Url.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) */ /** @@ -26,6 +26,10 @@ * - Store save (new store creation, changed store group) - require reindex all data * - Store group save (changed root category or group website) - require reindex all data * - Seo config settings change - require reindex all data + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Indexer_Url extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php index ab105eb4898..cb7834d7c24 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/State.php +++ b/app/code/core/Mage/Catalog/Model/Layer/State.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) */ /** * Layered navigation state model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Layer_State extends Varien_Object { diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php index 634cfe96efe..16bbefd0bdc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.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/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php index 252aa8fee34..79a646e18d3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.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/Backend/Sku.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php index 64f711b6d16..cb5884dbb9b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.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/Backend/Startdate.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php index 21ebe1dc026..ee199808082 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.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/Backend/Startdate/Specialprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php index 1fbff77088a..da75925ff37 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.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,9 +24,8 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Catalog_Model_Product_Attribute_Backend_Startdate_Specialprice extends Mage_Catalog_Model_Product_Attribute_Backend_Startdate { /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php index f77b46fe083..b33cb1af048 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.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/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php index 3db387f0534..23cdf6977ba 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.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_Model_Product_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Attribute_Backend_Urlkey_Abstract { - } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php index f841178662f..37862351d98 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.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/Set/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php index c83c4fdf820..71580c6dacd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.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/Source/Msrp/Type.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php index 10e8caff9f7..84538c1a69a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.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/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php index 92485e2ea3f..e74617adaea 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.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/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php index 6fb0a160f18..3f7bdbf6b32 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.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/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php index b7b1db9439d..151beb62f46 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.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 28bd80eaaa1..fa538ee6cb0 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 @@ -53,8 +53,6 @@ class Mage_Catalog_Model_Product_Option_Type_Default extends Varien_Object protected $_product; /** - * description - * * @var mixed */ protected $_productOptions = []; diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php index f912964c8d3..b5c89c0f86e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.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/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php index e350313ec11..14295f90c65 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.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 option select type model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Option_Value _getResource() * @method Mage_Catalog_Model_Resource_Product_Option_Value getResource() * @method int getOptionId() @@ -35,10 +39,6 @@ * @method float getStorePrice() * @method string getStoreTitle() * @method string getTitle() - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Option_Value extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php index ad36b9db4cb..b012c509382 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.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/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php index cca3d326562..63208666e9f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Product/Status.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) */ /** * Product status functionality model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Status _getResource() * @method Mage_Catalog_Model_Resource_Product_Status getResource() * @method int getProductId() @@ -29,10 +33,6 @@ * @method Mage_Catalog_Model_Product_Status setStoreId(int $value) * @method int getVisibility() * @method Mage_Catalog_Model_Product_Status setVisibility(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Status extends Mage_Core_Model_Abstract { @@ -46,9 +46,6 @@ class Mage_Catalog_Model_Product_Status extends Mage_Core_Model_Abstract */ protected $_attribute; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('catalog/product_status'); diff --git a/app/code/core/Mage/Catalog/Model/Product/Type.php b/app/code/core/Mage/Catalog/Model/Product/Type.php index f8494fe3a44..c23058d169a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type.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 type model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Type { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php index d7ee94ca0cf..f772ac2f2e2 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.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/Simple.php b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php index 4ba07147823..e68adde7482 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.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) */ /** * Simple product type implementation * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Type_Simple extends Mage_Catalog_Model_Product_Type_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php index 5e509e2c15e..a6a924a1dc3 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.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/Url.php b/app/code/core/Mage/Catalog/Model/Product/Url.php index c920d6123c0..11dd845e3b9 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Url.php +++ b/app/code/core/Mage/Catalog/Model/Product/Url.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/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php index 46ae4898553..9fcc4bc9166 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php +++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.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/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php index ab51135b1a5..4cea4379898 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Product/Website.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_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 Website Model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Website _getResource() * @method Mage_Catalog_Model_Resource_Product_Website getResource() * @method int getWebsiteId() * @method Mage_Catalog_Model_Product_Website setWebsiteId(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Website extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php index 7c7978b2ec5..b8d795354f0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php @@ -32,15 +32,11 @@ class Mage_Catalog_Model_Resource_Category_Collection extends Mage_Catalog_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_category_collection'; /** - * Event object name - * * @var string */ protected $_eventObject = 'category_collection'; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php index 0f110583a0e..5e45d6632d9 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php @@ -28,15 +28,11 @@ class Mage_Catalog_Model_Resource_Category_Flat_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_category_collection'; /** - * Event object name - * * @var string */ protected $_eventObject = 'category_collection'; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php index a6d0403dd07..6a450ceea3f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php @@ -69,10 +69,6 @@ class Mage_Catalog_Model_Resource_Category_Indexer_Product extends Mage_Index_Mo */ protected $_storesInfo; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('catalog/category_product_index', 'category_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php index 116eef29e9e..f0939a903a1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.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 tree 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_Tree extends Varien_Data_Tree_Dbp { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Config.php index cf9e5435539..0fd7f1e7b90 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Config.php @@ -41,10 +41,6 @@ class Mage_Catalog_Model_Resource_Config extends Mage_Core_Model_Resource_Db_Abs */ protected $_storeId = null; - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('eav/attribute', 'attribute_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php index cb0a9667c0a..5f0a819270d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php @@ -78,14 +78,10 @@ class Mage_Catalog_Model_Resource_Eav_Attribute extends Mage_Eav_Model_Entity_At const ENTITY = 'catalog_eav_attribute'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'catalog_entity_attribute'; /** - * Event object name - * * @var string */ protected $_eventObject = 'attribute'; diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php index f9ee91a37ff..d2cdf7ecaa0 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.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 tree 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_Tree extends Mage_Catalog_Model_Resource_Category_Tree diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php index 520543a0365..c2545103577 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.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 tier price backend attribute 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_Attribute_Backend_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Tierprice diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php index 98a5253ca58..8806d2db832 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.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 url key 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_Urlkey extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Urlkey diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php index a271e4532ba..df318b308d2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.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 attribute tier price frontend 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_Attribute_Frontend_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Frontend_Tierprice diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php index 977758e5a82..459203317fe 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.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 Select and Multiply Select 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_Source extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Source diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php index 38608c65ec1..7bd361e3a67 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.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 custom option 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_Option_Value extends Mage_Catalog_Model_Resource_Product_Option_Value diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php index b7cf4665789..7cb997792b1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.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 website 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_Status extends Mage_Catalog_Model_Resource_Product_Status diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php index fb719920a4a..b26f3f25011 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.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 Website 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_Website extends Mage_Catalog_Model_Resource_Product_Website diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php index f069892aa07..611d5bd3d46 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.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 entity setup * - * @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_Setup extends Mage_Catalog_Model_Resource_Setup diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php index 57c2b1263fb..12537cd25cd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.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 url rewrite 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_Url extends Mage_Catalog_Model_Resource_Url diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php index 73d2803ecc1..50f5903be36 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Layer_Filter_Attribute extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('catalog/product_index_eav', 'entity_id'); 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 1d13e4c6290..94825d089e7 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 @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Layer_Filter_Decimal extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('catalog/product_index_eav_decimal', 'entity_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php index 61f0dac3f1b..977e28b52b3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php @@ -32,10 +32,6 @@ class Mage_Catalog_Model_Resource_Layer_Filter_Price extends Mage_Core_Model_Res */ const MIN_POSSIBLE_PRICE = .01; - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('catalog/product_index_price', 'entity_id'); 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 5e82af82e25..c3119efd35e 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 @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('catalog/product_attribute_group_price', 'value_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php index 39c1da9afa1..4413d63bb84 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.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 product tier 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_Tierprice extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Groupprice_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('catalog/product_attribute_tier_price', 'value_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php index af7ddd42718..513d60ed01b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.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 url key attribute backend * - * @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_Urlkey extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php index 79f70d7a6a2..57c6ab0fc57 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.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 attribute tier price frontend 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_Frontend_Tierprice extends Mage_Eav_Model_Entity_Attribute_Frontend_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php index 3cd2d4f117c..69f2e3537c3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Compare_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('catalog/compare_item', 'catalog_compare_item_id'); 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 22cff515c63..f2cbaec39f0 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 @@ -93,10 +93,6 @@ class Mage_Catalog_Model_Resource_Product_Flat_Indexer extends Mage_Index_Model_ */ protected $_preparedFlatTables = []; - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('catalog/product', 'entity_id'); 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 c97bb82fec7..60126de6d38 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 @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Indexer_Eav_Decimal extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract { - /** - * Initialize connection and define main index table - * - */ protected function _construct() { $this->_init('catalog/product_index_eav_decimal', 'entity_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index 6e6d965a9a8..d2851ac8a77 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.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 Product Eav Select and Multiply Select 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_Source extends Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract { - /** - * Initialize connection and define main index table - * - */ protected function _construct() { $this->_init('catalog/product_index_eav', 'entity_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php index 7879745a822..6845d806258 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php @@ -34,9 +34,6 @@ class Mage_Catalog_Model_Resource_Product_Link extends Mage_Core_Model_Resource_ */ protected $_attributesTable; - /** - * Define main table name and attributes table - */ protected function _construct() { $this->_init('catalog/product_link', 'link_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php index da25bf1dfa8..185f292d5a6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php @@ -27,10 +27,6 @@ */ class Mage_Catalog_Model_Resource_Product_Option extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('catalog/product_option', 'option_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php index 9fde7721ae9..5df613eb3cd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.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 product custom option 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_Option_Value extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('catalog/product_option_type_value', 'option_type_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php index d1d8123c2c2..b773cebe9d5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.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 website 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_Status extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,10 +34,6 @@ class Mage_Catalog_Model_Resource_Product_Status extends Mage_Core_Model_Resourc */ protected $_productAttributes = []; - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('catalog/product_enabled_index', 'product_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php index a4d1a2f5752..fa709d08f73 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php @@ -51,10 +51,6 @@ class Mage_Catalog_Model_Resource_Product_Type_Configurable_Attribute_Collection */ protected $_product; - /** - * Initialize connection and define table names - * - */ protected function _construct() { $this->_init('catalog/product_type_configurable_attribute'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php index 6d32ce2d3f8..e7005ffd4e4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.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 Product Website 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_Website extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource table - * - */ protected function _construct() { $this->_init('catalog/product_website', 'product_id'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Setup.php b/app/code/core/Mage/Catalog/Model/Resource/Setup.php index 888fc5862b5..0052ee33dd7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Setup.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 entity setup * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Url.php index 2462b075a8b..41d229f053b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.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 url rewrite 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_Url extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php index 70b9766062d..7ceba624c11 100644 --- a/app/code/core/Mage/Catalog/Model/Session.php +++ b/app/code/core/Mage/Catalog/Model/Session.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 setBeforeCompareUrl(string $value) * @method array getFormData() diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php index 8f92a27040f..90e6f45ddb3 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.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) */ /** * Url rewrite suffix backend + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_System_Config_Backend_Catalog_Url_Rewrite_Suffix extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index e32a674e2f0..cbe587b895b 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.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/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php index e30cf66cb9c..2b5bf04f79f 100644 --- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.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,10 +23,10 @@ * * @category Mage * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Seo_SitemapController extends Mage_Core_Controller_Front_Action { - /** * Check if SEO sitemap is enabled in configuration * diff --git a/app/code/core/Mage/Catalog/etc/adminhtml.xml b/app/code/core/Mage/Catalog/etc/adminhtml.xml index 32d1d772349..c01e2b9146b 100644 --- a/app/code/core/Mage/Catalog/etc/adminhtml.xml +++ b/app/code/core/Mage/Catalog/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/api.xml b/app/code/core/Mage/Catalog/etc/api.xml index f7643e7b545..47d26fffd22 100644 --- a/app/code/core/Mage/Catalog/etc/api.xml +++ b/app/code/core/Mage/Catalog/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/api2.xml b/app/code/core/Mage/Catalog/etc/api2.xml index f877c8e554d..93a93b9f7ca 100644 --- a/app/code/core/Mage/Catalog/etc/api2.xml +++ b/app/code/core/Mage/Catalog/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/config.xml b/app/code/core/Mage/Catalog/etc/config.xml index 2dbe6c8d9de..b3bcf6e4c8c 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/convert.xml b/app/code/core/Mage/Catalog/etc/convert.xml index f9b54d02bb8..60e65a6c3df 100644 --- a/app/code/core/Mage/Catalog/etc/convert.xml +++ b/app/code/core/Mage/Catalog/etc/convert.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Catalog * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index ca108dfc8d0..26ea103549b 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/etc/widget.xml b/app/code/core/Mage/Catalog/etc/widget.xml index f11145db7e7..995b64eaf1f 100644 --- a/app/code/core/Mage/Catalog/etc/widget.xml +++ b/app/code/core/Mage/Catalog/etc/widget.xml @@ -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_Catalog - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php index ec9db851ab5..603b03b5d18 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.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_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; $productTypes = [ Mage_Catalog_Model_Product_Type::TYPE_SIMPLE, diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index 940f48e6b64..4858be611be 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -12,14 +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_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; + $installer->addAttribute(Mage_Catalog_Model_Product::ENTITY, 'country_of_manufacture', [ 'group' => 'General', 'type' => 'varchar', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php index f3cd2afc512..a7c2dc1ee3d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.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/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php index e4a6d8394b9..88c7b0ee980 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php @@ -12,14 +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_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; + $indexFields = ['website_id', 'customer_group_id', 'min_price']; $installer->getConnection()->addIndex( $installer->getTable('catalog/product_index_price'), diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php index ae9e2d7e026..f08f44d42b0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.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_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; foreach (['news_from_date', 'custom_design_from'] as $attributeCode) { $installer->updateAttribute( diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php index 32e2cb97080..bc66a9608f9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.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/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php index 41cef1fc679..163fd32484c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php @@ -12,14 +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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, 'special_from_date', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php index b5690fdf1e8..a0e1ab67feb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.1-1.6.0.0.19.1.2.php @@ -12,14 +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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, 'special_price', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php index 86e6a80a37b..f735c7cb381 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.2-1.6.0.0.19.1.3.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_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; $attribute = 'special_price'; $installer diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php index 91099028b17..2ddc9a5b041 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.4-1.6.0.0.19.1.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_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php index 490274773bd..dd0fe8732fa 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.19.1.5-1.6.0.0.19.1.6.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_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; -$attributeId = 'custom_layout_update'; +$attributeId = 'custom_layout_update'; $entitiesToUpgrade = [ $installer->getEntityTypeId('catalog_product'), $installer->getEntityTypeId('catalog_category'), diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php index 08a53d08f24..4af4ac3954b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php @@ -12,14 +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_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; + $tableName = $installer->getTable('catalog/product_index_eav_decimal'); $indexName = $installer->getConnection()->getPrimaryKeyName($tableName); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php index a238923a581..90d1dad9578 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php index 56315bc064c..6669ae2b608 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -12,14 +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_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->getConnection()->modifyColumn( $installer->getTable('catalog/category_product_index'), 'position', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php index 610fad3ddfc..12cc2332a85 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.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_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->updateAttribute( Mage_Catalog_Model_Product::ENTITY, diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php index c670724fca2..60c2177af8a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.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/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php index 01d2b8b3f0a..e1bc95427e7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.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/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php index ce83d239621..7bdf4641693 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.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/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php index b1fdcd95016..bf97d81a134 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.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) */ /** * Date retriever abstract model * - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Data_Simple extends Mage_CatalogIndex_Model_Data_Abstract { @@ -29,7 +31,6 @@ class Mage_CatalogIndex_Model_Data_Simple extends Mage_CatalogIndex_Model_Data_A /** * Retrieve product type code - * * @return string */ public function getTypeCode() diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php index 37208da96aa..fa38982a4a4 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.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) */ /** * Virtual product data retriever * - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Data_Virtual extends Mage_CatalogIndex_Model_Data_Simple { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php index 275189f2e06..09dbdee180b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.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) */ /** * Tier Price indexer * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @property Mage_Directory_Model_Currency $_currencyModel * @property Mage_Customer_Model_Resource_Group_Collection $_customerGroups * @@ -44,10 +48,6 @@ * @method $this setMaxPrice(float $value) * @method float getTierPrice() * @method $this setTierPrice(float $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Indexer_Tierprice extends Mage_CatalogIndex_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php index 8e8e7ef7221..dbca88069be 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.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_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 + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Setup extends Mage_CatalogIndex_Model_Resource_Setup diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php index 504a1b3fd58..e3473fd114c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.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_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 + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml index db9755e53ba..28ed5f16f29 100644 --- a/app/code/core/Mage/CatalogIndex/etc/config.xml +++ b/app/code/core/Mage/CatalogIndex/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogIndex * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php index 29b61ef4dd5..3f8e8e60507 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Data.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php index 9304338aae8..4f322b2c7e7 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.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) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php index 68b89b4b7c0..debe1933aa1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.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_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 Stock Status Indexer Model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Indexer_Stock _getResource() * @method Mage_CatalogInventory_Model_Resource_Indexer_Stock getResource() * @method int getProductId() @@ -33,10 +37,6 @@ * @method $this setQty(float $value) * @method int getStockStatus() * @method $this setStockStatus(int $value) - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Indexer_Stock extends Mage_Index_Model_Indexer_Abstract { @@ -81,10 +81,6 @@ class Mage_CatalogInventory_Model_Indexer_Stock extends Mage_Index_Model_Indexer Mage_CatalogInventory_Helper_Data::XML_PATH_SHOW_OUT_OF_STOCK ]; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cataloginventory/indexer_stock'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php index c8acc156791..586bf1736d6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.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 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 extends Mage_CatalogInventory_Model_Resource_Indexer_Stock diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php index af17464e30f..f60020d8c65 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.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) */ /** * Stock 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_Stock extends Mage_CatalogInventory_Model_Resource_Stock diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php index 0195c461f76..78ace38c9cc 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.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 Stock Status per website 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_Stock_Status extends Mage_CatalogInventory_Model_Resource_Stock_Status diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php index 0152c0b1e12..f9111c441fa 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.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 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 extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract { @@ -42,10 +42,6 @@ class Mage_CatalogInventory_Model_Resource_Indexer_Stock extends Mage_Catalog_Mo */ protected $_defaultIndexer = 'cataloginventory/indexer_stock_default'; - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('cataloginventory/stock_status', 'product_id'); 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 a984b99a667..44dfae870a3 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 @@ -41,10 +41,6 @@ class Mage_CatalogInventory_Model_Resource_Indexer_Stock_Default extends Mage_Ca */ protected $_isComposite = false; - /** - * Initialize connection and define main table name - * - */ protected function _construct() { $this->_init('cataloginventory/stock_status', 'product_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php index 8f8c6a07542..c65233c5aac 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.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) */ /** * Stock 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_Stock extends Mage_Core_Model_Resource_Db_Abstract { @@ -76,10 +76,6 @@ class Mage_CatalogInventory_Model_Resource_Stock extends Mage_Core_Model_Resourc */ protected $_stock; - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('cataloginventory/stock', 'stock_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php index 6084c10ce55..ba253ac1132 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php @@ -27,10 +27,6 @@ */ class Mage_CatalogInventory_Model_Resource_Stock_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('cataloginventory/stock_item', 'item_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php index bf87c7b9a89..91ec1b24360 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.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_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 Stock Status per website 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_Stock_Status extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource model initialization - * - */ protected function _construct() { $this->_init('cataloginventory/stock_status', 'product_id'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php index 13924beba63..2ad26aed95f 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.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) */ /** @@ -28,8 +28,6 @@ class Mage_CatalogInventory_Model_Source_Stock { /** - * Retrieve option array - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Stock.php index 562c83fa8d6..1e176265666 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock.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_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) */ /** * Stock model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Stock _getResource() * @method Mage_CatalogInventory_Model_Resource_Stock getResource() * @method string getStockName() * @method Mage_CatalogInventory_Model_Stock setStockName(string $value) - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php index adbdf36f10b..136229eb07e 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.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_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) */ /** * Catalog inventory api V2 * + * @category Mage + * @package Mage_CatalogInventory * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock_Item_Api_V2 extends Mage_CatalogInventory_Model_Stock_Item_Api diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index 53802c6a2aa..5a14e960396 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.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_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 Stock Status per website Model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Stock_Status _getResource() * @method Mage_CatalogInventory_Model_Resource_Stock_Status getResource() * @method int getProductId() @@ -33,10 +37,6 @@ * @method Mage_CatalogInventory_Model_Stock_Status setQty(float $value) * @method int getStockStatus() * @method Mage_CatalogInventory_Model_Stock_Status setStockStatus(int $value) - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock_Status extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml index 40e2b834fed..70350767de6 100644 --- a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/api.xml b/app/code/core/Mage/CatalogInventory/etc/api.xml index 4bb2e5429f6..3c958c725c1 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/api2.xml b/app/code/core/Mage/CatalogInventory/etc/api2.xml index 59371b0a24e..8c0d6566f0f 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api2.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/config.xml b/app/code/core/Mage/CatalogInventory/etc/config.xml index ec8c7c5decc..e079ad5e4c7 100644 --- a/app/code/core/Mage/CatalogInventory/etc/config.xml +++ b/app/code/core/Mage/CatalogInventory/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogInventory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml index 17e27ac84df..e4ec5f83bfe 100644 --- a/app/code/core/Mage/CatalogInventory/etc/system.xml +++ b/app/code/core/Mage/CatalogInventory/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index e7af10103cb..b58ffed228b 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.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) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ diff --git a/app/code/core/Mage/CatalogRule/Helper/Data.php b/app/code/core/Mage/CatalogRule/Helper/Data.php index 7e2bfb9f785..90d4bd741bc 100644 --- a/app/code/core/Mage/CatalogRule/Helper/Data.php +++ b/app/code/core/Mage/CatalogRule/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml index 6ab2aadbb63..6702576f493 100644 --- a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml index 5c4b507a78f..e1f0f077d34 100644 --- a/app/code/core/Mage/CatalogRule/etc/config.xml +++ b/app/code/core/Mage/CatalogRule/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php index 02f44f5e0f4..8138da70ca8 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/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_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 */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php index 31e114a70d8..f0dfc2dec4f 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.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_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 */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php index 1df011b56c8..ee7b7ac8f6d 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.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_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(); $ruleProductTable = $installer->getTable('catalogrule/rule_product'); diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php index ad24531c494..30faf7b723c 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Term.php +++ b/app/code/core/Mage/CatalogSearch/Block/Term.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) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php index 915c3501456..3f4c14fa240 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php index dda7d8d465b..8f05706ec6d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Query.php @@ -53,16 +53,9 @@ */ class Mage_CatalogSearch_Model_Query extends Mage_Core_Model_Abstract { - /** - * Event prefix - * - * @var string - */ protected $_eventPrefix = 'catalogsearch_query'; /** - * Event object key name - * * @var string */ protected $_eventObject = 'catalogsearch_query'; diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php index 1204195be6b..072b177d245 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php @@ -27,10 +27,6 @@ */ class Mage_CatalogSearch_Model_Resource_Advanced extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define catalog product table as main table - * - */ protected function _construct() { $this->_init('catalog/product', 'entity_id'); 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 0a17a47aff4..3a5c7d21b2c 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php @@ -27,9 +27,6 @@ */ class Mage_CatalogSearch_Model_Resource_Indexer_Fulltext extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define catalog product table as main table - */ protected function _construct() { $this->_init('catalogsearch/fulltext', 'product_id'); diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php index 508b74b49fb..27c1ecb7f51 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Session.php +++ b/app/code/core/Mage/CatalogSearch/Model/Session.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_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) */ +/** + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team + */ class Mage_CatalogSearch_Model_Session extends Mage_Core_Model_Session_Abstract { public function __construct() diff --git a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php index fcb4b10966e..6a4bdbde8dc 100644 --- a/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php +++ b/app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.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_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) */ /** * Cache cleaner backend model * + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_System_Config_Backend_Sitemap extends Mage_Adminhtml_Model_System_Config_Backend_Cache { diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php index 7a1e174e155..353c794a1c6 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.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) */ +/** + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team + */ class Mage_CatalogSearch_TermController extends Mage_Core_Controller_Front_Action { - /** * @return $this|Mage_Core_Controller_Front_Action */ diff --git a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml index 0364e1c6c26..7b50fc6a121 100644 --- a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml index 0014c33e727..a243b1695fa 100644 --- a/app/code/core/Mage/CatalogSearch/etc/config.xml +++ b/app/code/core/Mage/CatalogSearch/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CatalogSearch * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml index f415aac3ebc..203f0acff70 100644 --- a/app/code/core/Mage/CatalogSearch/etc/system.xml +++ b/app/code/core/Mage/CatalogSearch/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php index f064cfeccdc..d7150ca2b80 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.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_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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php index 4052d42eb98..f733d8f92d6 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php @@ -12,20 +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_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) */ /** * Adminhtml sales order create validation card block + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Block_Adminhtml_Validation extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { - /** - * construct - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Centinel/Block/Authentication/Start.php b/app/code/core/Mage/Centinel/Block/Authentication/Start.php index 4d9172beb6a..a2a0f9b5acd 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication/Start.php +++ b/app/code/core/Mage/Centinel/Block/Authentication/Start.php @@ -12,20 +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_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) */ /** * Authentication start/redirect form + * + * @category Mage + * @package Mage_Centinal + * @author Magento Core Team */ class Mage_Centinel_Block_Authentication_Start extends Mage_Core_Block_Template { /** * Prepare form parameters and render - * * @return string */ protected function _toHtml() diff --git a/app/code/core/Mage/Centinel/Helper/Data.php b/app/code/core/Mage/Centinel/Helper/Data.php index ffdf6bb7e6d..db6d7610e04 100644 --- a/app/code/core/Mage/Centinel/Helper/Data.php +++ b/app/code/core/Mage/Centinel/Helper/Data.php @@ -21,9 +21,9 @@ /** * Centinel module base helper * - * @category Mage - * @package Mage_Centinel - * @author Magento Core Team + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Centinel/Model/Session.php b/app/code/core/Mage/Centinel/Model/Session.php index 51d5861341e..525ac238514 100644 --- a/app/code/core/Mage/Centinel/Model/Session.php +++ b/app/code/core/Mage/Centinel/Model/Session.php @@ -12,23 +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_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) */ /** * * Payment centinel session model * - * @author Magento Core Team + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_Session extends Mage_Core_Model_Session_Abstract { - /** - * constructor - */ public function __construct() { $this->init('centinel_validator'); diff --git a/app/code/core/Mage/Centinel/Model/State/Visa.php b/app/code/core/Mage/Centinel/Model/State/Visa.php index 71f1a5dfa41..cec6c9b19af 100644 --- a/app/code/core/Mage/Centinel/Model/State/Visa.php +++ b/app/code/core/Mage/Centinel/Model/State/Visa.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_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) */ /** * Abstract Validation State Model for Visa + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_State_Visa extends Mage_Centinel_Model_StateAbstract { diff --git a/app/code/core/Mage/Centinel/Model/StateAbstract.php b/app/code/core/Mage/Centinel/Model/StateAbstract.php index 444b52a98a7..1b3bcb54a30 100644 --- a/app/code/core/Mage/Centinel/Model/StateAbstract.php +++ b/app/code/core/Mage/Centinel/Model/StateAbstract.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_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) */ /** * Abstract Validation State Model + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ abstract class Mage_Centinel_Model_StateAbstract extends Varien_Object { diff --git a/app/code/core/Mage/Centinel/etc/config.xml b/app/code/core/Mage/Centinel/etc/config.xml index 6b482e160bf..37b820a51cf 100644 --- a/app/code/core/Mage/Centinel/etc/config.xml +++ b/app/code/core/Mage/Centinel/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Centinel * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Centinel/etc/system.xml b/app/code/core/Mage/Centinel/etc/system.xml index ed6d38cc9b7..14a7b575642 100644 --- a/app/code/core/Mage/Centinel/etc/system.xml +++ b/app/code/core/Mage/Centinel/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php index e68dd31ff2b..30fd8b863de 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.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_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) */ /** - * Class Mage_Checkout_Block_Cart_Shipping + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Cart_Shipping extends Mage_Checkout_Block_Cart_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php index 0f2cbe0f9ab..b94d2f31e64 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.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) */ /** * Wishlist sidebar block * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Cart_Sidebar extends Mage_Checkout_Block_Cart_Minicart { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php index 280c36c0548..053043ae093 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.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_Cart_Totals extends Mage_Checkout_Block_Cart_Abstract { protected $_totalRenderers; diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php index f24dd0b83c3..2990c6eb365 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.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) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/State.php b/app/code/core/Mage/Checkout/Block/Multishipping/State.php index 2c2fa5247a8..3d34039308d 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.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_State extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php index 3ceb9e6ad94..d11dae28806 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.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_Success extends Mage_Checkout_Block_Multishipping_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php index 9414566e9c2..f5927f8045f 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.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) */ /** * One page checkout status * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Shipping extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php index b38aca6b78e..6e148fbcffe 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.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) */ /** diff --git a/app/code/core/Mage/Checkout/Block/Success.php b/app/code/core/Mage/Checkout/Block/Success.php index 2cc0a44a11b..f8dba9f385a 100644 --- a/app/code/core/Mage/Checkout/Block/Success.php +++ b/app/code/core/Mage/Checkout/Block/Success.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_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) */ /** * Class Mage_Checkout_Block_Success * + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team + * * @method int getLastOrderId() */ class Mage_Checkout_Block_Success extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php index 18874c00298..5f797eedb93 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Tax.php +++ b/app/code/core/Mage/Checkout/Block/Total/Tax.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) */ /** * Tax Total Row Renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Total_Tax extends Mage_Checkout_Block_Total_Default { diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php index b5bbf4aad1a..42128c87643 100644 --- a/app/code/core/Mage/Checkout/Helper/Data.php +++ b/app/code/core/Mage/Checkout/Helper/Data.php @@ -21,9 +21,9 @@ /** * Checkout default helper * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php index 24edc01e3bc..b19c7dfd0fd 100644 --- a/app/code/core/Mage/Checkout/Helper/Url.php +++ b/app/code/core/Mage/Checkout/Helper/Url.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) */ /** * Checkout url helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Helper_Url extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php index ab6a43603e9..8f55b29261c 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.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 model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Cart_Api_V2 extends Mage_Checkout_Model_Cart_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php index 767c2f0bb14..4c6c0cd97ff 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.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_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 api * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Coupon_Api_V2 extends Mage_Checkout_Model_Cart_Coupon_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php index dd123fc57f4..dbf6f1e05b8 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.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) */ /** * Shoping cart api for customer data * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Cart_Customer_Api_V2 extends Mage_Checkout_Model_Cart_Customer_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php index e79a18c65b5..af217786fd1 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.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_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 api * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Payment_Api_V2 extends Mage_Checkout_Model_Cart_Payment_Api { /** diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php index a66851f1d26..3b54dd77587 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.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_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 api for product * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Product_Api_V2 extends Mage_Checkout_Model_Cart_Product_Api { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php index ae779f301c3..8400e3b084c 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.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_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 api * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ - class Mage_Checkout_Model_Cart_Shipping_Api_V2 extends Mage_Checkout_Model_Cart_Shipping_Api { diff --git a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php index 636dfcb7198..f6bd827d76e 100644 --- a/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php +++ b/app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.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_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_Model_Config_Source_Cart_Summary { diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php index a01cc924d07..e4604b48581 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.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) */ /** * Checkout Resource Setup Model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * @deprecated */ class Mage_Checkout_Model_Mysql4_Setup extends Mage_Checkout_Model_Resource_Setup diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php index f3be77c43ac..310c5d70a93 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php @@ -27,10 +27,6 @@ */ class Mage_Checkout_Model_Resource_Agreement extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('checkout/agreement', 'agreement_id'); diff --git a/app/code/core/Mage/Checkout/Model/Resource/Cart.php b/app/code/core/Mage/Checkout/Model/Resource/Cart.php index 948091e0cb8..d3dea12c902 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Cart.php @@ -27,10 +27,6 @@ */ class Mage_Checkout_Model_Resource_Cart extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/quote', 'entity_id'); diff --git a/app/code/core/Mage/Checkout/Model/Resource/Setup.php b/app/code/core/Mage/Checkout/Model/Resource/Setup.php index e1bed491cf2..8054bfe0396 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Setup.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) */ /** * Checkout Resource Setup Model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php index 7089dfe36c3..1c4bb746b48 100644 --- a/app/code/core/Mage/Checkout/Model/Session.php +++ b/app/code/core/Mage/Checkout/Model/Session.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_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) */ /** - * Class Mage_Checkout_Model_Session + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method $this setAdditionalMessages(array $value) * diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php index 8381260eb32..9cd541ea393 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php @@ -39,9 +39,6 @@ class Mage_Checkout_Model_Type_Multishipping extends Mage_Checkout_Model_Type_Ab */ protected $_quoteShippingAddressesItems; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php index f41625a0325..2028b79e0c6 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.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_Model_Type_Multishipping_State extends Varien_Object { diff --git a/app/code/core/Mage/Checkout/etc/adminhtml.xml b/app/code/core/Mage/Checkout/etc/adminhtml.xml index e8b0cf5ef14..2d054df2f2f 100644 --- a/app/code/core/Mage/Checkout/etc/adminhtml.xml +++ b/app/code/core/Mage/Checkout/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/api.xml b/app/code/core/Mage/Checkout/etc/api.xml index 8720fe13034..146cfc799cc 100644 --- a/app/code/core/Mage/Checkout/etc/api.xml +++ b/app/code/core/Mage/Checkout/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/config.xml b/app/code/core/Mage/Checkout/etc/config.xml index 29b1e2f96ca..ea945fdba43 100644 --- a/app/code/core/Mage/Checkout/etc/config.xml +++ b/app/code/core/Mage/Checkout/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/jstranslator.xml b/app/code/core/Mage/Checkout/etc/jstranslator.xml index b6aa3060cc4..11a1ce313df 100644 --- a/app/code/core/Mage/Checkout/etc/jstranslator.xml +++ b/app/code/core/Mage/Checkout/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Checkout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml index 2adaa43333e..77aa48bbabf 100644 --- a/app/code/core/Mage/Checkout/etc/system.xml +++ b/app/code/core/Mage/Checkout/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php index 3b110ee8ea0..cd71dfd54fe 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.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) */ /** * Wysiwyg Images model * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Model_Wysiwyg_Images_Storage extends Varien_Object { diff --git a/app/code/core/Mage/Cms/etc/adminhtml.xml b/app/code/core/Mage/Cms/etc/adminhtml.xml index 7809b041a67..36c9e762b5c 100644 --- a/app/code/core/Mage/Cms/etc/adminhtml.xml +++ b/app/code/core/Mage/Cms/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml index 77b89e9c58a..b35d57a4a4c 100644 --- a/app/code/core/Mage/Cms/etc/config.xml +++ b/app/code/core/Mage/Cms/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Cms * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml index 49477500519..2a89fd6ac1a 100644 --- a/app/code/core/Mage/Cms/etc/system.xml +++ b/app/code/core/Mage/Cms/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cms/etc/widget.xml b/app/code/core/Mage/Cms/etc/widget.xml index 379fabeb9cc..b1e5a787590 100644 --- a/app/code/core/Mage/Cms/etc/widget.xml +++ b/app/code/core/Mage/Cms/etc/widget.xml @@ -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_Cms - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php index 67839c159fe..2b132ceafee 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.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_ConfigurableSwatches + * @category Mage + * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_ConfigurableSwatches_Block_Catalog_Layer_State_Swatch * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team + * * @method $this setJsonConfig(string $value) * @method int getSwatchInnerHeight() * @method $this setSwatchInnerHeight(int $value) diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php index 2121c73ba7c..5a6570135bd 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php @@ -13,15 +13,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_ConfigurableSwatches + * @category Mage + * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_ConfigurableSwatches_Block_Catalog_Product_View_Type_Configurable_Swatches * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team + * * @method $this setJsonConfig(string $value) * @method $this setSwatchInnerHeight(int $value) * @method $this setSwatchInnerWidth(int $value) diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php index 0fb0cf24965..0fe682acc19 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_ConfigurableSwatches - * @author Magento Core Team + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php index c2dc0f02fc0..2f4666a9513 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.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_ConfigurableSwatches + * @category Mage + * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-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_ConfigurableSwatches_Helper_Swatchdimensions + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Swatchdimensions extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml b/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml index 529945c2360..5abcbc4fb7e 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/config.xml b/app/code/core/Mage/ConfigurableSwatches/etc/config.xml index 20e95b84c37..4dba0e93549 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/config.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml b/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml index 22d23f0689b..fbc692847a0 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ConfigurableSwatches * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml index 7f42e65f3e7..a8d0b751dc7 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_ConfigurableSwatches - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/adminhtml.xml b/app/code/core/Mage/Contacts/etc/adminhtml.xml index 04d7b6011e0..c5a0f45c82c 100644 --- a/app/code/core/Mage/Contacts/etc/adminhtml.xml +++ b/app/code/core/Mage/Contacts/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/config.xml b/app/code/core/Mage/Contacts/etc/config.xml index 17672c7bee1..c8f6dd7a14e 100644 --- a/app/code/core/Mage/Contacts/etc/config.xml +++ b/app/code/core/Mage/Contacts/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Contacts * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index 439c5a03a55..09d96d101c8 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php index c178dbfb736..690a4793a7a 100644 --- a/app/code/core/Mage/Core/Block/Store/Switcher.php +++ b/app/code/core/Mage/Core/Block/Store/Switcher.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 array getLanguages() * @method $this setLanguages(array $value) diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php index 2f1bb12ef1a..32a42ef149f 100644 --- a/app/code/core/Mage/Core/Block/Template.php +++ b/app/code/core/Mage/Core/Block/Template.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/Template/Smarty.php b/app/code/core/Mage/Core/Block/Template/Smarty.php index 671bb38e597..20c35faaf8d 100644 --- a/app/code/core/Mage/Core/Block/Template/Smarty.php +++ b/app/code/core/Mage/Core/Block/Template/Smarty.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 + */ class Mage_Core_Block_Template_Smarty extends Mage_Core_Block_Template { - } diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php index e74f88b0d25..25d3e154a8e 100644 --- a/app/code/core/Mage/Core/Block/Template/Zend.php +++ b/app/code/core/Mage/Core/Block/Template/Zend.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_Block_Template_Zend extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Core/Block/Text.php b/app/code/core/Mage/Core/Block/Text.php index 218cf8695ae..d0933863b9a 100644 --- a/app/code/core/Mage/Core/Block/Text.php +++ b/app/code/core/Mage/Core/Block/Text.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 * * @method array getLiParams() * @method $this setLiParams(array $value) diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php index ac9a0168ac7..e260a575abd 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag.php +++ b/app/code/core/Mage/Core/Block/Text/Tag.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 * * @method string getTagContents() * @method $this setTagContents(string $value) @@ -31,7 +33,6 @@ */ class Mage_Core_Block_Text_Tag extends Mage_Core_Block_Text { - protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index 252abc2133b..3bda4003bc0 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -122,8 +122,6 @@ abstract class Mage_Core_Controller_Varien_Action protected $_removeDefaultTitle = false; /** - * Constructor - * * @param Zend_Controller_Request_Abstract $request * @param Zend_Controller_Response_Abstract $response * @param array $invokeArgs diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php index 7b4f59a26e3..eb03def399e 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.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_Standard extends Mage_Core_Controller_Varien_Router_Abstract { protected $_modules = []; diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index 27fb3ab2b7f..c7455c6a1e3 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -21,9 +21,9 @@ /** * Core data helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/File/Storage.php b/app/code/core/Mage/Core/Helper/File/Storage.php index 78f9f6f0a2b..3241701f726 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage.php +++ b/app/code/core/Mage/Core/Helper/File/Storage.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 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 extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php index 87a29135351..72325b628b6 100644 --- a/app/code/core/Mage/Core/Helper/String.php +++ b/app/code/core/Mage/Core/Helper/String.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) */ /** * Core data helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_String extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/Translate.php b/app/code/core/Mage/Core/Helper/Translate.php index 2d1d178ddce..2deb43bcf52 100644 --- a/app/code/core/Mage/Core/Helper/Translate.php +++ b/app/code/core/Mage/Core/Helper/Translate.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) */ /** * Core data helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Translate extends Mage_Core_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Helper/UnserializeArray.php b/app/code/core/Mage/Core/Helper/UnserializeArray.php index f343706842d..b9d8c17464e 100644 --- a/app/code/core/Mage/Core/Helper/UnserializeArray.php +++ b/app/code/core/Mage/Core/Helper/UnserializeArray.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 unserialize helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_UnserializeArray { diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php index 00ab2b56a07..30b6f6a04bf 100644 --- a/app/code/core/Mage/Core/Helper/Url.php +++ b/app/code/core/Mage/Core/Helper/Url.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_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 URL helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Url extends Mage_Core_Helper_Abstract { - /** * Retrieve current url * diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index a2afc9897aa..494ad35bcf6 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -255,9 +255,6 @@ class Mage_Core_Model_App */ protected $_isInstalled = null; - /** - * Constructor - */ public function __construct() { } diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php index 527aea5acdc..1c580c03f7c 100644 --- a/app/code/core/Mage/Core/Model/App/Emulation.php +++ b/app/code/core/Mage/Core/Model/App/Emulation.php @@ -42,8 +42,6 @@ class Mage_Core_Model_App_Emulation extends Varien_Object protected $_app; /** - * Constructor - * * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php index f49f332682b..2bdd8fb3288 100644 --- a/app/code/core/Mage/Core/Model/Config/System.php +++ b/app/code/core/Mage/Core/Model/Config/System.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_Config_System extends Mage_Core_Model_Config_Base { diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php index 8650bee8913..9795398b439 100644 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ b/app/code/core/Mage/Core/Model/Design/Fallback.php @@ -52,7 +52,6 @@ class Mage_Core_Model_Design_Fallback protected $_visited; /** - * Constructor * @param array $params */ public function __construct(array $params = []) diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index 8411b1134bb..4e4b312d0bb 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.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) */ /** @@ -32,6 +32,10 @@ * ); * $emailTemplate->send('some@domain.com', 'Name Of User', $variables); * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Email_Template _getResource() * @method Mage_Core_Model_Resource_Email_Template getResource() * @method string getTemplateCode() @@ -72,10 +76,6 @@ * @method bool getUseAbsoluteLinks() * @method setUseAbsoluteLinks(bool $value) * @method $this setInlineCssFile(string $value) - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Email_Template extends Mage_Core_Model_Email_Template_Abstract { diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php index e95c9a1d9b7..a698c6abb1f 100644 --- a/app/code/core/Mage/Core/Model/Email/Transport.php +++ b/app/code/core/Mage/Core/Model/Email/Transport.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_Email_Transport extends Zend_Mail_Transport_Sendmail { diff --git a/app/code/core/Mage/Core/Model/File/Storage.php b/app/code/core/Mage/Core/Model/File/Storage.php index 49ab685124e..69d096bf752 100644 --- a/app/code/core/Mage/Core/Model/File/Storage.php +++ b/app/code/core/Mage/Core/Model/File/Storage.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 model 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 extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/File/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php index afeb0acff57..ea70dfc8764 100644 --- a/app/code/core/Mage/Core/Model/File/Uploader.php +++ b/app/code/core/Mage/Core/Model/File/Uploader.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/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php index dc6651d715a..4838364fc2c 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php @@ -74,9 +74,6 @@ class Mage_Core_Model_File_Validator_AvailablePath extends Zend_Validate_Abstrac */ protected $_pathsData; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php index 482c4a28538..42b76d11c27 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php +++ b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php @@ -43,9 +43,6 @@ class Mage_Core_Model_File_Validator_NotProtectedExtension extends Zend_Validate */ protected $_protectedFileExtensions = []; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php b/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php index 945998f569c..0bf283dbd09 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php +++ b/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.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/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index a8c3b9551ec..2914f36093f 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.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_Update { /** diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php index 5a19d23efdb..ee7f4725966 100644 --- a/app/code/core/Mage/Core/Model/Layout/Validator.php +++ b/app/code/core/Mage/Core/Model/Layout/Validator.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) */ /** @@ -77,9 +77,6 @@ class Mage_Core_Model_Layout_Validator extends Zend_Validate_Abstract self::PROTECTED_ATTR_HELPER_IN_TAG_ACTION_VAR => '//action/*[@helper]', ]; - /** - * Construct - */ public function __construct() { $this->_initMessageTemplates(); diff --git a/app/code/core/Mage/Core/Model/Magento/Api/V2.php b/app/code/core/Mage/Core/Model/Magento/Api/V2.php index 3451f17fad1..26ae2a4495c 100644 --- a/app/code/core/Mage/Core/Model/Magento/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Magento/Api/V2.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/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php index 7ca6c9bdd1a..9d9d5e3bbf7 100644 --- a/app/code/core/Mage/Core/Model/Message/Success.php +++ b/app/code/core/Mage/Core/Model/Message/Success.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_Success extends Mage_Core_Model_Message_Abstract { /** diff --git a/app/code/core/Mage/Core/Model/Message/Warning.php b/app/code/core/Mage/Core/Model/Message/Warning.php index 20c60f4a8ef..4c1ea08aceb 100644 --- a/app/code/core/Mage/Core/Model/Message/Warning.php +++ b/app/code/core/Mage/Core/Model/Message/Warning.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_Warning extends Mage_Core_Model_Message_Abstract { /** diff --git a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php index c223b03306f..8317f23a8a3 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.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) */ /** * Template db resource * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Email_Template extends Mage_Core_Model_Resource_Email_Template diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php index d47037389bc..987f4b82718 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Session.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) */ /** * Mysql4 session save handler * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Session extends Mage_Core_Model_Resource_Session diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store.php b/app/code/core/Mage/Core/Model/Mysql4/Store.php index 5ab9f554038..d898718c70a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store.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_Store extends Mage_Core_Model_Resource_Store diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php index 6d53b9914f1..035ab2f0502 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.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) */ /** * Translation 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_Translate extends Mage_Core_Model_Resource_Translate diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php index 24ae159cfc3..b6d81d12a93 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.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) */ /** * String translate 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_Translate_String extends Mage_Core_Model_Resource_Translate_String diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable.php b/app/code/core/Mage/Core/Model/Mysql4/Variable.php index 1834cd5c90b..c890eeb9f91 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable.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) */ /** * Custom variable 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_Variable extends Mage_Core_Model_Resource_Variable diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php index d7e38aa250c..17d68384d00 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website.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_Website extends Mage_Core_Model_Resource_Website diff --git a/app/code/core/Mage/Core/Model/Resource/Cache.php b/app/code/core/Mage/Core/Model/Resource/Cache.php index c934529c863..1848d7c48d3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Cache.php +++ b/app/code/core/Mage/Core/Model/Resource/Cache.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Cache extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/cache_option', 'code'); diff --git a/app/code/core/Mage/Core/Model/Resource/Config.php b/app/code/core/Mage/Core/Model/Resource/Config.php index 0dcc4adda67..a8c305614fd 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config.php +++ b/app/code/core/Mage/Core/Model/Resource/Config.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Config extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/config_data', 'config_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Config/Data.php b/app/code/core/Mage/Core/Model/Resource/Config/Data.php index cde19bd268b..b3fd13f7df4 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Resource/Config/Data.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Config_Data extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/config_data', 'config_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Design.php b/app/code/core/Mage/Core/Model/Resource/Design.php index 41c3754c745..a0520257e81 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design.php +++ b/app/code/core/Mage/Core/Model/Resource/Design.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Design extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and primary key - * - */ protected function _construct() { $this->_init('core/design_change', 'design_change_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template.php b/app/code/core/Mage/Core/Model/Resource/Email/Template.php index 3549e396519..b7b0a9b4ea3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template.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_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) */ /** * Template db resource * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Email_Template extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize email template resource model - * - */ protected function _construct() { $this->_init('core/email_template', 'template_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php index 448449065d8..4e34fb89300 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php @@ -12,21 +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_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) */ /** * Class describing db table resource entity * + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Entity_Table extends Mage_Core_Model_Resource_Entity_Abstract { /** - * Get table - * * @return String */ public function getTable() diff --git a/app/code/core/Mage/Core/Model/Resource/Flag.php b/app/code/core/Mage/Core/Model/Resource/Flag.php index d6bf99c5c79..abb115007aa 100644 --- a/app/code/core/Mage/Core/Model/Resource/Flag.php +++ b/app/code/core/Mage/Core/Model/Resource/Flag.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Flag extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/flag', 'flag_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Language.php b/app/code/core/Mage/Core/Model/Resource/Language.php index a85c8c85e63..108f769be4f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Language.php +++ b/app/code/core/Mage/Core/Model/Resource/Language.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Language extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/language', 'language_code'); diff --git a/app/code/core/Mage/Core/Model/Resource/Layout.php b/app/code/core/Mage/Core/Model/Resource/Layout.php index d2322044510..63aa1a8d835 100644 --- a/app/code/core/Mage/Core/Model/Resource/Layout.php +++ b/app/code/core/Mage/Core/Model/Resource/Layout.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Layout extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/layout_update', 'layout_update_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Resource.php b/app/code/core/Mage/Core/Model/Resource/Resource.php index d2c636be6d3..c3145f9b14c 100644 --- a/app/code/core/Mage/Core/Model/Resource/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource/Resource.php @@ -41,10 +41,6 @@ class Mage_Core_Model_Resource_Resource extends Mage_Core_Model_Resource_Db_Abst */ protected static $_dataVersions = null; - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/resource', 'store_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php index 397bd3cf5b5..61e7b65d585 100644 --- a/app/code/core/Mage/Core/Model/Resource/Session.php +++ b/app/code/core/Mage/Core/Model/Resource/Session.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) */ /** * Mysql4 session save handler * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Interface { @@ -69,10 +69,6 @@ class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Inter */ protected $_automaticCleaningFactor = 50; - /** - * Constructor - * - */ public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index b207d10a125..e7ca1e0864a 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.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) */ /** * Resource Setup Model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Core/Model/Resource/Store.php b/app/code/core/Mage/Core/Model/Resource/Store.php index 769192be190..6309ff32d61 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store.php +++ b/app/code/core/Mage/Core/Model/Resource/Store.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_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 Store 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 extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and primary key - * - */ protected function _construct() { $this->_init('core/store', 'store_id'); 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 6b4c7fe4fe7..d79efb550cb 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group.php @@ -27,10 +27,6 @@ */ class Mage_Core_Model_Resource_Store_Group extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/store_group', 'group_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php index 01fad7fed86..4dd657f68c8 100644 --- a/app/code/core/Mage/Core/Model/Resource/Transaction.php +++ b/app/code/core/Mage/Core/Model/Resource/Transaction.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_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) */ /** * Resource transaction model * - * @todo need collect conection by name * @category Mage * @package Mage_Core * @author Magento Core Team + * @todo need collect conection by name */ class Mage_Core_Model_Resource_Transaction { diff --git a/app/code/core/Mage/Core/Model/Resource/Translate.php b/app/code/core/Mage/Core/Model/Resource/Translate.php index d4da60fbe03..75607fcd12b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate.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_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) */ /** * Translation 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_Translate extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/translate', 'key_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Translate/String.php b/app/code/core/Mage/Core/Model/Resource/Translate/String.php index b0663c8d603..f5802bfc066 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate/String.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_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) */ /** * String translate 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_Translate_String extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/translate', 'key_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php index 365b61fffcc..2fc25a65409 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.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_Resource_Type_Db_Mysqli_Setup extends Mage_Core_Model_Resource_Type_Db { /** diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php index b6eb5a87f4b..c4be58bd92b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php @@ -34,10 +34,6 @@ class Mage_Core_Model_Resource_Url_Rewrite extends Mage_Core_Model_Resource_Db_A */ protected $_tagTable; - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/url_rewrite', 'url_rewrite_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Variable.php b/app/code/core/Mage/Core/Model/Resource/Variable.php index 9d991236d55..088fad12d42 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable.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_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 variable 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_Variable extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor - * - */ protected function _construct() { $this->_init('core/variable', 'variable_id'); diff --git a/app/code/core/Mage/Core/Model/Resource/Website.php b/app/code/core/Mage/Core/Model/Resource/Website.php index 7bc186442d7..50ab26d40ec 100644 --- a/app/code/core/Mage/Core/Model/Resource/Website.php +++ b/app/code/core/Mage/Core/Model/Resource/Website.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_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 Website 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_Website extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('core/website', 'website_id'); diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php index aeec2e7a425..67f15279585 100644 --- a/app/code/core/Mage/Core/Model/Session.php +++ b/app/code/core/Mage/Core/Model/Session.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) */ /** * Core session model * - * @todo extend from Mage_Core_Model_Session_Abstract + * @category Mage + * @package Mage_Core + * @author Magento Core Team * * @method null|bool getCookieShouldBeReceived() * @method $this setCookieShouldBeReceived(bool $value) diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php index 246a9e33c56..68ca00e8dc3 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -12,15 +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_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 bool|null getSkipEmptySessionCheck() * @method $this setSkipEmptySessionCheck(bool $flag) */ - class Mage_Core_Model_Session_Abstract_Varien extends Varien_Object { const VALIDATOR_KEY = '_session_validator_data'; diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php index 96537419303..503640963ac 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.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 getCookieDomain() * @method string getCookiePath() diff --git a/app/code/core/Mage/Core/Model/Source/Email/Variables.php b/app/code/core/Mage/Core/Model/Source/Email/Variables.php index 6791473a96b..bc3908705fb 100644 --- a/app/code/core/Mage/Core/Model/Source/Email/Variables.php +++ b/app/code/core/Mage/Core/Model/Source/Email/Variables.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) */ /** @@ -34,10 +34,6 @@ class Mage_Core_Model_Source_Email_Variables */ protected $_configVariables = []; - /** - * Constructor - * - */ public function __construct() { $this->_configVariables = [ diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 5f30c3413ea..1f41c682491 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.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 model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Store _getResource() * @method Mage_Core_Model_Resource_Store getResource() * @method Mage_Core_Model_Resource_Store_Collection getCollection() @@ -43,10 +47,6 @@ * @method $this setStoreId(int $value) * @method $this setWebsiteId(int $value) * @method string getRootCategoryPath() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract { @@ -186,8 +186,6 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract protected $_eventPrefix = 'store'; /** - * Event object name - * * @var string */ protected $_eventObject = 'store'; diff --git a/app/code/core/Mage/Core/Model/Store/Api/V2.php b/app/code/core/Mage/Core/Model/Store/Api/V2.php index 5b53ceab1b7..c4db4a4c7dc 100644 --- a/app/code/core/Mage/Core/Model/Store/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Store/Api/V2.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/Template.php b/app/code/core/Mage/Core/Model/Template.php index 2511abb25d1..954ed07b4e8 100644 --- a/app/code/core/Mage/Core/Model/Template.php +++ b/app/code/core/Mage/Core/Model/Template.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) */ /** * Template model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ abstract class Mage_Core_Model_Template extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index 1d5ad2619a8..af9915f95f9 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.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 model * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Translate { diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php index e77585ddf7d..4956752f629 100644 --- a/app/code/core/Mage/Core/Model/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Translate/String.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) */ /** * String translation model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Translate_String _getResource() * @method Mage_Core_Model_Resource_Translate_String getResource() * @method int getStoreId() @@ -31,10 +35,6 @@ * @method $this setStoreTranslations(array $value) * @method string getLocale() * @method $this setLocale(string $value) - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Translate_String extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php index 9bb499db55c..91d9866aaa4 100644 --- a/app/code/core/Mage/Core/Model/Url.php +++ b/app/code/core/Mage/Core/Model/Url.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) */ /** @@ -68,7 +68,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team * * @method $this setType(string $value) * @method $this setSecure(bool $value) diff --git a/app/code/core/Mage/Core/Model/Url/Validator.php b/app/code/core/Mage/Core/Model/Url/Validator.php index 0b07e6b5e10..ace4f5058ad 100644 --- a/app/code/core/Mage/Core/Model/Url/Validator.php +++ b/app/code/core/Mage/Core/Model/Url/Validator.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/Variable.php b/app/code/core/Mage/Core/Model/Variable.php index 484fc0fd999..aaec08cb163 100644 --- a/app/code/core/Mage/Core/Model/Variable.php +++ b/app/code/core/Mage/Core/Model/Variable.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) */ /** * Custom variable model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Variable _getResource() * @method Mage_Core_Model_Resource_Variable getResource() * @method string getCode() @@ -30,10 +34,6 @@ * @method bool getUseDefaultValue() * @method string getHtmlValue() * @method string getPlainValue() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Variable extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php index b2fd1fa91b4..404afebf424 100644 --- a/app/code/core/Mage/Core/Model/Website.php +++ b/app/code/core/Mage/Core/Model/Website.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 Website model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Website _getResource() * @method Mage_Core_Model_Resource_Website getResource() * @method Mage_Core_Model_Resource_Website_Collection getCollection() @@ -41,12 +45,7 @@ * @method bool hasWebsiteId() * @method int getWebsiteId() * @method bool hasDefaultGroupId() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ - class Mage_Core_Model_Website extends Mage_Core_Model_Abstract { const ENTITY = 'core_website'; diff --git a/app/code/core/Mage/Core/etc/api.xml b/app/code/core/Mage/Core/etc/api.xml index f99607b0ed8..8021a02ed9c 100644 --- a/app/code/core/Mage/Core/etc/api.xml +++ b/app/code/core/Mage/Core/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 46f850546e6..5176685c5fb 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/jstranslator.xml b/app/code/core/Mage/Core/etc/jstranslator.xml index 5a1f46f9e39..39f04f7ec1c 100644 --- a/app/code/core/Mage/Core/etc/jstranslator.xml +++ b/app/code/core/Mage/Core/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Core * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 1f6e61f5e28..a3a4e74f25f 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php index aa7ac9671cc..0530663d20c 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.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(); $installer->getConnection()->dropForeignKey( diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php index c86685849ac..91098efd850 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.2-1.6.0.3.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $table = $installer->getTable('core/translate'); diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php index 9e070398a73..9be11e9378b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php index 1b7f863430a..bd4eb6f82bf 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.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/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php index 5d7ce3afbba..ff46b47457e 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.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_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(); -$connection = $installer->getConnection(); +$connection = $installer->getConnection(); $connection->delete( $this->getTable('core_config_data'), $connection->prepareSqlCondition('path', [ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php index 3f7807f3f5f..c2da8bcf442 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.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_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(); -$connection = $installer->getConnection(); +$connection = $installer->getConnection(); $connection->delete( $this->getTable('core_config_data'), $connection->prepareSqlCondition('path', [ diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php index 760660d0191..74f1a3f765f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.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_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(); -$connection = $installer->getConnection(); +$connection = $installer->getConnection(); $connection->addColumn($installer->getTable('core_config_data'), 'updated_at', Varien_Db_Ddl_Table::TYPE_TIMESTAMP); $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php index d089a30c3a8..3ec33bd8435 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.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_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(); + $table = $installer->getTable('core/file_storage'); /** diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml index f5b3c0749ff..a43c344a8f7 100644 --- a/app/code/core/Mage/Cron/etc/config.xml +++ b/app/code/core/Mage/Cron/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Cron * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml index 64a0e47915d..fb8aff962a7 100644 --- a/app/code/core/Mage/Cron/etc/system.xml +++ b/app/code/core/Mage/Cron/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php index ad8753582bb..3e73f07a3af 100644 --- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php @@ -34,9 +34,6 @@ class Mage_CurrencySymbol_Block_Adminhtml_System_Currencysymbol extends Mage_Adm */ private $_controller; - /** - * Constructor. Initialization required variables for class instance. - */ public function __construct() { $this->_blockGroup = 'currencysymbol_system'; diff --git a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php index dc530c9b820..cdf0458edf7 100644 --- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php +++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php @@ -21,9 +21,9 @@ /** * Adminhtml Currency Symbols Controller * - * @category Mage - * @package Mage_CurrencySymbol - * @author Magento Core Team + * @category Mage + * @package Mage_CurrencySymbol + * @author Magento Core Team */ class Mage_CurrencySymbol_Adminhtml_System_CurrencysymbolController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml index a252e4f29bf..2d12af2db19 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CurrencySymbol * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/CurrencySymbol/etc/config.xml b/app/code/core/Mage/CurrencySymbol/etc/config.xml index a2d2302469d..e69a2cebb2a 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/config.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_CurrencySymbol * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard.php b/app/code/core/Mage/Customer/Block/Account/Dashboard.php index a28aa748e91..a481602582f 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php @@ -21,9 +21,9 @@ /** * Customer dashboard block * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team * * @method string getRefererUrl() * @method $this setRefererUrl(string $value) diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php index bd439f49f01..dce1f6936b4 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.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_Sidebar extends Mage_Core_Block_Template { protected $_cartItemsCount; diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php index 69d13588ab8..d24a963ca5b 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php +++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.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) */ /** * Class Mage_Customer_Block_Widget_Taxvat * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method $this setFieldIdFormat(string $value) * @method $this setFieldNameFormat(string $value) * @method $this setTaxvat(string $value) diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php index 930b943f879..968c94690b9 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php index 7323798bc93..8ec56cdd327 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Admin/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php index 55c3734bded..bbace81c4f1 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest/Customer/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php index 5011393b2fc..1ead6e84bc0 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Validator.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php index 47c1dca7130..41a2e63a988 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Admin/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php index 16df1361cac..29442e04697 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php index 706fa07229a..b92a9268beb 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.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 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_Text extends Mage_Eav_Model_Attribute_Data_Text { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php index 63f7142ffd7..ceeecc69318 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.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 Text Area 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_Textarea extends Mage_Eav_Model_Attribute_Data_Textarea { diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php index de7f56f265d..a2d19f6476a 100644 --- a/app/code/core/Mage/Customer/Model/Config/Share.php +++ b/app/code/core/Mage/Customer/Model/Config/Share.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_Config_Share extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php index cc54f540e04..75871b57184 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Convert_Adapter_Customer extends Mage_Eav_Model_Convert_Adapter_Entity { diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php index 9d87bbaf643..9c47587994e 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Convert_Parser_Customer extends Mage_Eav_Model_Convert_Parser_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index 384c3225787..72b604f63a5 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -21,9 +21,9 @@ /** * Customer model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team * * @method Mage_Customer_Model_Resource_Customer getResource() * @method Mage_Customer_Model_Resource_Customer _getResource() diff --git a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php index 228d414c08f..48f71b091b5 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php index d2b90138c23..d0e62b25fec 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.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_Backend_Shipping extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php index 591ce4118cc..54576e20bee 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Store.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_Backend_Store extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php index 131f5a19d84..799a2068838 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Website.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_Backend_Website extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php index 44447f67fd7..f55b74b5fe8 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.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_Store extends Mage_Eav_Model_Entity_Attribute_Source_Table { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php index c3fdded4da5..b56c479593b 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Website.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_Website extends Mage_Eav_Model_Entity_Attribute_Source_Table { diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php index fed0f38b098..b3c64665856 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Street.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 password attribute backend * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Entity_Address_Attribute_Backend_Street extends Mage_Customer_Model_Resource_Address_Attribute_Backend_Street { diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php index 2a87f7fd055..e8cd71292db 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Country.php @@ -35,8 +35,6 @@ class Mage_Customer_Model_Entity_Address_Attribute_Source_Country extends Mage_C protected $_factory; /** - * Constructor for Mage_Customer_Model_Entity_Address_Attribute_Source_Country - * * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php index 83251e74e64..90431400e70 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Setup.php +++ b/app/code/core/Mage/Customer/Model/Entity/Setup.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 resource setup model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Entity_Setup extends Mage_Customer_Model_Resource_Setup { diff --git a/app/code/core/Mage/Customer/Model/Group/Api/V2.php b/app/code/core/Mage/Customer/Model/Group/Api/V2.php index 4e1d89b82f5..ca2e35b87d8 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Group/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php index 2bd361ea582..43bf5b6503b 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.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 password attribute backend * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Resource_Address_Attribute_Backend_Street extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php index c879885758b..59ddd91a242 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php @@ -27,10 +27,6 @@ */ class Mage_Customer_Model_Resource_Form_Attribute extends Mage_Eav_Model_Resource_Form_Attribute { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('customer/form_attribute', 'attribute_id'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Setup.php b/app/code/core/Mage/Customer/Model/Resource/Setup.php index b508d3c317b..88aa7a41779 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Setup.php +++ b/app/code/core/Mage/Customer/Model/Resource/Setup.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 resource setup model * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php index 2fc33190c4e..de5f1d7d041 100644 --- a/app/code/core/Mage/Customer/Model/Session.php +++ b/app/code/core/Mage/Customer/Model/Session.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 session model * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method string getAddActionReferer() * @method $this setAddActionReferer(string $value) * @method array getAddressFormData() @@ -52,10 +56,6 @@ * @method bool hasWishlistItemCount() * @method int getWishlistItemCount() * @method $this setWishlistItemCount(int $value) - * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team */ class Mage_Customer_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml index 4e561ffd4f9..28cdf1e4666 100644 --- a/app/code/core/Mage/Customer/etc/adminhtml.xml +++ b/app/code/core/Mage/Customer/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/api.xml b/app/code/core/Mage/Customer/etc/api.xml index 3240777b90b..709d25f5426 100644 --- a/app/code/core/Mage/Customer/etc/api.xml +++ b/app/code/core/Mage/Customer/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/api2.xml b/app/code/core/Mage/Customer/etc/api2.xml index d648e09e484..05702862d40 100644 --- a/app/code/core/Mage/Customer/etc/api2.xml +++ b/app/code/core/Mage/Customer/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/config.xml b/app/code/core/Mage/Customer/etc/config.xml index 0dc85b25c84..42dd0562a78 100644 --- a/app/code/core/Mage/Customer/etc/config.xml +++ b/app/code/core/Mage/Customer/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Customer * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/etc/system.xml b/app/code/core/Mage/Customer/etc/system.xml index 723c6563cca..8dd50915b93 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php index b5743f65446..ad874d01fd5 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.1.0-1.6.2.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_Entity_Setup $installer */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php index 6a9939b3470..f92f443e4f8 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.0.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0-1.6.2.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_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/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php index 0e0745c7c72..9677c137cc8 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.1-1.6.2.0.2.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) */ /** diff --git a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.php index b687f98aa86..fa3aa386814 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.3-1.6.2.0.4.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/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.0.5.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.0.5.php index 2eb0d3f75d5..b28d8095bc6 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.0.5.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.4-1.6.2.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_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/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.0.6.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.0.6.php index a8653da74c9..effb5af1e19 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.0.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.5-1.6.2.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_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/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.php b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.php index 7aad536a43d..6b5663983ba 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/upgrade-1.6.2.0.6-1.6.2.0.7.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/Dataflow/Model/Convert/Adapter/Db/Table.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php index c84d25f8bc4..9af118af92b 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Db/Table.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_Db_Table extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function getResource() { if (!$this->_resource) { @@ -45,5 +44,4 @@ public function save() { } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php index d135a471fff..8dbdd6e3bf9 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.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_Soap extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function load() { return $this; @@ -37,5 +36,4 @@ public function save() { return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php index 79c9fd3eb34..1d09e9a83c7 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.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_Std extends Mage_Dataflow_Model_Convert_Adapter_Abstract { - public function load() { $data = ''; @@ -44,5 +43,4 @@ public function save() echo $this->getData(); return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php index 5a826341521..815924177a1 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.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 Session 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_Session extends Mage_Dataflow_Model_Resource_Session diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch.php index 9221282a425..8b56fd309ec 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Batch extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/batch', 'batch_id'); 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 52031851def..47565e5cbbf 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Batch_Export extends Mage_Dataflow_Model_Resource_Batch_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/batch_export', 'batch_export_id'); 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 f02873972df..ca3801cbc1e 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Batch_Import extends Mage_Dataflow_Model_Resource_Batch_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/batch_import', 'batch_import_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Import.php b/app/code/core/Mage/Dataflow/Model/Resource/Import.php index 53083d5e750..8cf39c7b6d0 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Import extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/import', 'import_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php index 7db3690b082..39a840a22db 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php @@ -27,10 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Profile extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/profile', 'profile_id'); 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 155d9ed807a..d41ac39dfbb 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php @@ -27,9 +27,6 @@ */ class Mage_Dataflow_Model_Resource_Profile_History extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - */ protected function _construct() { $this->_init('dataflow/profile_history', 'history_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Session.php b/app/code/core/Mage/Dataflow/Model/Resource/Session.php index 50349ad5df7..c93fdcec81d 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Session.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_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 Session 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_Session extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('dataflow/session', 'session_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Session.php b/app/code/core/Mage/Dataflow/Model/Session.php index 774d7f58cda..ba26b0380a3 100644 --- a/app/code/core/Mage/Dataflow/Model/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Session.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 Session Model * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Session _getResource() * @method Mage_Dataflow_Model_Resource_Session getResource() * @method int getUserId() @@ -35,17 +39,11 @@ * @method Mage_Dataflow_Model_Session setDirection(string $value) * @method string getComment() * @method Mage_Dataflow_Model_Session setComment(string $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Session extends Mage_Core_Model_Abstract { - protected function _construct() { $this->_init('dataflow/session'); } - } diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml index 0735bbe0ea4..f4ce85a6be1 100644 --- a/app/code/core/Mage/Dataflow/etc/config.xml +++ b/app/code/core/Mage/Dataflow/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Dataflow * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php index 269a0a42b7f..191ed15cc0e 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Region/Updater.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_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_Block_Adminhtml_Frontend_Region_Updater extends Mage_Adminhtml_Block_System_Config_Form_Field { /** diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index fb6076c0ce6..9f54a07464d 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -92,7 +92,6 @@ class Mage_Directory_Helper_Data extends Mage_Core_Helper_Abstract protected $_app; /** - * Constructor for Mage_Directory_Helper_Data * @param array $args */ public function __construct(array $args = []) diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php index e3adf559761..0b316dde5b5 100644 --- a/app/code/core/Mage/Directory/Helper/Url.php +++ b/app/code/core/Mage/Directory/Helper/Url.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) */ /** * Directory URL helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team */ class Mage_Directory_Helper_Url extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/Directory/Model/Country/Api/V2.php b/app/code/core/Mage/Directory/Model/Country/Api/V2.php index 2a79f7581f2..97212e55280 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Country/Api/V2.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/Currency/Import/Webservicex.php b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php index 4e1f7a619b8..d9d4963cd6b 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.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) */ /** @@ -23,8 +23,7 @@ * * @category Mage * @package Mage_Directory - * @author Magento Core Team - * + * @author Magento Core Team * @deprecated after 1.9.4.3 */ class Mage_Directory_Model_Currency_Import_Webservicex extends Mage_Directory_Model_Currency_Import_Abstract diff --git a/app/code/core/Mage/Directory/Model/Region/Api/V2.php b/app/code/core/Mage/Directory/Model/Region/Api/V2.php index 33fa404d2cb..c405d9aa89d 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Region/Api/V2.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/Resource/Country/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php index be8b2003374..bb3afb0b0ce 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php @@ -29,9 +29,6 @@ */ class Mage_Directory_Model_Resource_Country_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Define main table - */ protected function _construct() { $this->_init('directory/country'); diff --git a/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php index b34aa88158a..ba29e7eef30 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Format/Collection.php @@ -27,10 +27,6 @@ */ class Mage_Directory_Model_Resource_Country_Format_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('directory/country_format'); diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml index 53ef99263ce..4f26404e96f 100644 --- a/app/code/core/Mage/Directory/etc/api.xml +++ b/app/code/core/Mage/Directory/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml index 1bb2ae4bf7d..0627bfed6a0 100644 --- a/app/code/core/Mage/Directory/etc/config.xml +++ b/app/code/core/Mage/Directory/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Directory * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml index 8bfbcad4839..3bdbdff9eb7 100644 --- a/app/code/core/Mage/Directory/etc/system.xml +++ b/app/code/core/Mage/Directory/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php index 762d70687bf..670f8e152c3 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/upgrade-1.6.0.1-1.6.0.2.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/Downloadable/Block/Catalog/Product/View/Type.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php index 14a45ca22e8..91c0aa7f49f 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/View/Type.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_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) */ /** * Catalog downloadable product part block * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Block_Catalog_Product_View_Type extends Mage_Catalog_Block_Product_View_Type_Virtual { - } diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php index 14fb2a9829f..97247d3f079 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Success.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) */ /** @@ -27,7 +27,6 @@ */ class Mage_Downloadable_Block_Checkout_Success extends Mage_Checkout_Block_Onepage_Success { - /** * Return true if order(s) has one or more downloadable products * diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php index 143664924f5..d4c74905afd 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.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) */ /** * File uploader for API * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Api_Uploader extends Mage_Core_Model_File_Uploader { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php index fc6bec04792..2397bee1680 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.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 links API model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Api_V2 extends Mage_Downloadable_Model_Link_Api { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php index 184af5455a5..3732587ad8f 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.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 links validator * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Api_Validator //extends Mage_Api_Model_Resource_Abstract { diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index c7824b1f35c..2c26e567949 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.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 product type model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Product_Type extends Mage_Catalog_Model_Product_Type_Virtual { diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link.php b/app/code/core/Mage/Downloadable/Model/Resource/Link.php index 49f33050c45..baa00953d1a 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link.php @@ -27,9 +27,6 @@ */ class Mage_Downloadable_Model_Resource_Link extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource - */ protected function _construct() { $this->_init('downloadable/link', 'link_id'); diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php index 67e22598680..c9e27853cff 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php @@ -27,10 +27,6 @@ */ class Mage_Downloadable_Model_Resource_Sample extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('downloadable/sample', 'sample_id'); diff --git a/app/code/core/Mage/Downloadable/etc/adminhtml.xml b/app/code/core/Mage/Downloadable/etc/adminhtml.xml index cd5803fd8a9..785b8ab1318 100644 --- a/app/code/core/Mage/Downloadable/etc/adminhtml.xml +++ b/app/code/core/Mage/Downloadable/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/api.xml b/app/code/core/Mage/Downloadable/etc/api.xml index 1c51316f3c9..fe4a5e156b7 100644 --- a/app/code/core/Mage/Downloadable/etc/api.xml +++ b/app/code/core/Mage/Downloadable/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml index cf9c77a205a..aad31e78374 100644 --- a/app/code/core/Mage/Downloadable/etc/config.xml +++ b/app/code/core/Mage/Downloadable/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Downloadable * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml index a2b938cc2b1..0887da8388f 100644 --- a/app/code/core/Mage/Downloadable/etc/system.xml +++ b/app/code/core/Mage/Downloadable/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php index b05ba56486e..1c5f8d2f2ec 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.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_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 $installer */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php index 4618ef3d85a..44fe7b0cc89 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.1-1.6.0.0.2.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) */ /** @var Mage_Catalog_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php index 51d2e6ffb0e..465ce9a3efe 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php @@ -12,14 +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_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_Core_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( $this->getTable('core_config_data'), @@ -27,4 +28,5 @@ 'like' => 'catalog/downloadable/content_disposition' ]) ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php index 2af71f035b0..62a486535c7 100644 --- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php +++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.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,10 +27,6 @@ */ class Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator extends Zend_Validate_InArray { - - /** - * Construct - */ public function __construct() { //set data haystack diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php index cb1b81a8c98..856afa65bd1 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.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/Textarea.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php index 7e066f6846d..93acb2e3168 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.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/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php index 26e41507b0a..705cf4f14e1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Store.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/Updated.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php index a1516f4686f..db9b5f3a830 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Updated.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/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php index c06adb46a6a..45cb41dd271 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.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) */ /** @@ -52,10 +52,6 @@ class Mage_Eav_Model_Entity_Attribute_Set extends Mage_Core_Model_Abstract */ protected $_eventPrefix = 'eav_entity_attribute_set'; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('eav/entity_attribute_set'); diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php index a8583f8bfa3..e55f7f82dfc 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.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/Source/Table.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php index 67041c491ef..bd251ef474d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Table.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/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php index e1757a35b57..1333147ecff 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Setup.php +++ b/app/code/core/Mage/Eav/Model/Entity/Setup.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/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php index 4205f04c82f..2fa566c8648 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Store.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) */ /** @@ -36,9 +36,6 @@ */ class Mage_Eav_Model_Entity_Store extends Mage_Core_Model_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_store'); diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php index c2780f0595d..4fee97e4b85 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Entity/Type.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) */ /** @@ -77,9 +77,6 @@ class Mage_Eav_Model_Entity_Type extends Mage_Core_Model_Abstract */ protected $_sets; - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type'); diff --git a/app/code/core/Mage/Eav/Model/Form/Type.php b/app/code/core/Mage/Eav/Model/Form/Type.php index f8b3f21c67f..586670b6ae4 100644 --- a/app/code/core/Mage/Eav/Model/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Form/Type.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/Set.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php index 88d398b4692..83c3bda206f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set.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/Store.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php index a6969498668..442324458bb 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.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/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php index 1aa4b650ed2..360aefbe0de 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.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/Type.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php index fd7a89c502b..38a5606f9c2 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.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.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php index 6a0bcd5eea4..b32e023768f 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php @@ -34,18 +34,12 @@ class Mage_Eav_Model_Resource_Entity_Attribute extends Mage_Core_Model_Resource_ */ protected static $_entityAttributes = []; - /** - * Define main table - * - */ protected function _construct() { $this->_init('eav/attribute', 'attribute_id'); } /** - * Initialize unique fields - * * @return $this */ protected function _initUniqueFields() diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php index f72c9e309c8..3e9de4fde60 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.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,10 +27,6 @@ */ class Mage_Eav_Model_Resource_Entity_Attribute_Set extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('eav/attribute_set', 'attribute_set_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php index 7a12d07368b..fa7d17e1afa 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.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,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Entity_Store extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_store', 'entity_store_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php index f5a05e72f00..5349ff17817 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.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,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Entity_Type extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type', 'entity_type_id'); 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 33f969e8a9a..1b75327c563 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php @@ -27,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Form_Element extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - */ protected function _construct() { $this->_init('eav/form_element', 'element_id'); 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 ada3b35d3d5..32353a73c2c 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php @@ -27,9 +27,6 @@ */ class Mage_Eav_Model_Resource_Form_Fieldset extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - */ protected function _construct() { $this->_init('eav/form_fieldset', 'fieldset_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type.php index 3ac0d5176ad..ba8377495e6 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type.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) */ /** @@ -29,10 +29,6 @@ */ class Mage_Eav_Model_Resource_Form_Type extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('eav/form_type', 'type_id'); diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index 7e3ba140593..cd1b1e9a265 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Eav * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php index 31065921fa1..a5e8bd2e5c5 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/upgrade-1.6.0.0-1.6.0.1.php @@ -15,13 +15,13 @@ * @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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index 489b56436a8..4c523ec2536 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.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 */ class Mage_GiftMessage_Helper_Url extends Mage_Core_Helper_Url { diff --git a/app/code/core/Mage/GiftMessage/Model/Api/V2.php b/app/code/core/Mage/GiftMessage/Model/Api/V2.php index 99e49038989..5d18e738385 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api/V2.php +++ b/app/code/core/Mage/GiftMessage/Model/Api/V2.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/Model/Mysql4/Setup.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php index 3ee58383aa6..d008243c035 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.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_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) */ /** * Gift Message resource setup * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team * @deprecated */ class Mage_GiftMessage_Model_Mysql4_Setup extends Mage_GiftMessage_Model_Resource_Setup diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php index 86dd8727a86..33dd382e3ff 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.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_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) */ /** * Gift Message resource setup * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team */ class Mage_GiftMessage_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/GiftMessage/etc/api.xml b/app/code/core/Mage/GiftMessage/etc/api.xml index 3121f74a164..bece4d998fb 100644 --- a/app/code/core/Mage/GiftMessage/etc/api.xml +++ b/app/code/core/Mage/GiftMessage/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml index 93720dcdfcc..17fefcb0d52 100644 --- a/app/code/core/Mage/GiftMessage/etc/config.xml +++ b/app/code/core/Mage/GiftMessage/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GiftMessage * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/etc/system.xml b/app/code/core/Mage/GiftMessage/etc/system.xml index 8816526f455..8c916a7fd12 100644 --- a/app/code/core/Mage/GiftMessage/etc/system.xml +++ b/app/code/core/Mage/GiftMessage/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php b/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php index dc9d892b42e..2b1f159a601 100644 --- a/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php +++ b/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.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) */ /** @@ -23,6 +23,7 @@ * * @category Mage * @package Mage_GoogleAnalytics + * @author Magento Core Team */ class Mage_GoogleAnalytics_Model_System_Config_Source_Type { diff --git a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml index 1a1140ef303..aebc84c86c4 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml index a4996b3ebfa..7fd5f157290 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GoogleAnalytics * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml index 3de5af0c866..a193924d209 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml index d0cfa8359d3..a34a5fa3e1e 100644 --- a/app/code/core/Mage/GoogleCheckout/etc/config.xml +++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_GoogleCheckout * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> 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 a20bb1e0fe4..7f5e2133f12 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php @@ -27,9 +27,6 @@ */ class Mage_ImportExport_Block_Adminhtml_Import_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php index 390f7df8e3e..d6593979440 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php @@ -169,9 +169,6 @@ abstract class Mage_ImportExport_Model_Export_Entity_Abstract */ protected $_websiteIdToCode = []; - /** - * Constructor. - */ public function __construct() { $entityCode = $this->getEntityTypeCode(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php index fdb43608bf5..e75fe77e853 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php @@ -69,9 +69,6 @@ class Mage_ImportExport_Model_Export_Entity_Customer extends Mage_ImportExport_M */ protected $_permanentAttributes = [self::COL_EMAIL, self::COL_WEBSITE, self::COL_STORE]; - /** - * Constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php index 08688883d8b..c60d6637934 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -109,9 +109,6 @@ class Mage_ImportExport_Model_Export_Entity_Product extends Mage_ImportExport_Mo */ protected $_attributeScopes = []; - /** - * Constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php index 1c97fe216dd..03a5874bbc7 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Simple.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 simple 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_Simple extends Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php index 6098ce3a9e4..90f85249a04 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php @@ -187,9 +187,6 @@ abstract class Mage_ImportExport_Model_Import_Entity_Abstract */ protected $_uniqueAttributes = []; - /** - * Constructor. - */ public function __construct() { $entityType = Mage::getSingleton('eav/config')->getEntityType($this->getEntityTypeCode()); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php index 1420a09f9e5..951e9b7efaf 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php @@ -208,9 +208,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer extends Mage_ImportExport_M */ protected $_websiteIdToCode = []; - /** - * Constructor. - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php index 814c5200a14..ddaae9ab2ca 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php @@ -128,8 +128,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer_Address extends Mage_Import protected $_regions = []; /** - * Constructor. - * * @param Mage_ImportExport_Model_Import_Entity_Customer $customer */ public function __construct(Mage_ImportExport_Model_Import_Entity_Customer $customer) diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php index 4eda964599a..ab26b526dda 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php @@ -429,10 +429,6 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo */ protected $_urlKeyAttributeId; - /** - * Constructor. - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php index 66da722239d..8f5805b39ac 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Simple.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 simple product type * - * @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_Simple extends Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php index 1312e7d8825..95fe3e35f2c 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Uploader.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 product model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Import_Uploader extends Mage_Core_Model_File_Uploader { diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php index 7cf6f2a05d4..c8bf875c374 100644 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.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) */ /** * ImportExport setup model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team * @deprecated */ class Mage_ImportExport_Model_Mysql4_Setup extends Mage_ImportExport_Model_Resource_Setup diff --git a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php index 10333a4a900..500bb8ffcb9 100644 --- a/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.php +++ b/app/code/core/Mage/ImportExport/Model/Product/Attribute/Backend/Urlkey.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) */ /** * Backend model for product url_key attribute * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Product_Attribute_Backend_Urlkey extends Mage_Catalog_Model_Product_Attribute_Backend_Urlkey { diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php b/app/code/core/Mage/ImportExport/Model/Resource/Setup.php index 8e655209214..1a9416bbb9b 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Setup.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) */ /** * ImportExport setup model * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/ImportExport/etc/adminhtml.xml b/app/code/core/Mage/ImportExport/etc/adminhtml.xml index ed5dd5fb89e..6fc17c1094e 100644 --- a/app/code/core/Mage/ImportExport/etc/adminhtml.xml +++ b/app/code/core/Mage/ImportExport/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/etc/config.xml b/app/code/core/Mage/ImportExport/etc/config.xml index 7d770e95c56..b1614b80def 100644 --- a/app/code/core/Mage/ImportExport/etc/config.xml +++ b/app/code/core/Mage/ImportExport/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ImportExport * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/etc/system.xml b/app/code/core/Mage/ImportExport/etc/system.xml index 86e02d67930..1ad4807b2bb 100644 --- a/app/code/core/Mage/ImportExport/etc/system.xml +++ b/app/code/core/Mage/ImportExport/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php index 799f6531bb7..7abc4cd151a 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tabs.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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Index/Model/Lock.php b/app/code/core/Mage/Index/Model/Lock.php index 158018b024a..a4cb5a31399 100644 --- a/app/code/core/Mage/Index/Model/Lock.php +++ b/app/code/core/Mage/Index/Model/Lock.php @@ -67,9 +67,6 @@ class Mage_Index_Model_Lock */ protected static $_lockFileResource = []; - /** - * Constructor - */ protected function __construct() { register_shutdown_function([$this, 'shutdownReleaseLocks']); 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 b14a9901987..a44aa114253 100644 --- a/app/code/core/Mage/Index/Model/Lock/Storage/Db.php +++ b/app/code/core/Mage/Index/Model/Lock/Storage/Db.php @@ -37,9 +37,6 @@ class Mage_Index_Model_Lock_Storage_Db implements Mage_Index_Model_Lock_Storage_ */ protected $_connection; - /** - * Constructor - */ public function __construct() { /** @var Mage_Core_Model_Resource $resource */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Setup.php b/app/code/core/Mage/Index/Model/Mysql4/Setup.php index 944dbf7b588..886a80ed4b5 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Setup.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_Setup extends Mage_Index_Model_Resource_Setup diff --git a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php index 61496d1a143..934fbdcd323 100644 --- a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php +++ b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php @@ -27,9 +27,6 @@ */ class Mage_Index_Model_Resource_Lock_Resource extends Mage_Core_Model_Resource { - /** - * Constructor - */ public function __construct() { $this->_connections = Mage::getSingleton('core/resource')->getConnections(); diff --git a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php index 269f628f78a..138daa8c073 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php +++ b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php @@ -28,15 +28,11 @@ class Mage_Index_Model_Resource_Process_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event object name - * * @var string */ protected $_eventObject = 'process_collection'; /** - * Event prefix name - * * @var string */ protected $_eventPrefix = 'process_collection'; diff --git a/app/code/core/Mage/Index/Model/Resource/Setup.php b/app/code/core/Mage/Index/Model/Resource/Setup.php index a81101c29b8..5b6546d9927 100644 --- a/app/code/core/Mage/Index/Model/Resource/Setup.php +++ b/app/code/core/Mage/Index/Model/Resource/Setup.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 Setup Model * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Index/etc/adminhtml.xml b/app/code/core/Mage/Index/etc/adminhtml.xml index a95ba110b37..fd20671d9eb 100644 --- a/app/code/core/Mage/Index/etc/adminhtml.xml +++ b/app/code/core/Mage/Index/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml index a25ad11e94c..8946304d3bf 100644 --- a/app/code/core/Mage/Index/etc/config.xml +++ b/app/code/core/Mage/Index/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Index * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Install/Block/Db/Type.php b/app/code/core/Mage/Install/Block/Db/Type.php index 8b6f6ae9e2c..f251582ba11 100644 --- a/app/code/core/Mage/Install/Block/Db/Type.php +++ b/app/code/core/Mage/Install/Block/Db/Type.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) */ /** * Common database config installation block * - * @author Magento Core Team + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_Block_Db_Type extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Install/Block/State.php b/app/code/core/Mage/Install/Block/State.php index 193ccf022d1..3f8497f3667 100644 --- a/app/code/core/Mage/Install/Block/State.php +++ b/app/code/core/Mage/Install/Block/State.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_Block_State extends Mage_Core_Block_Template { @@ -32,5 +32,4 @@ public function __construct() $this->setTemplate('install/state.phtml'); $this->assign('steps', Mage::getSingleton('install/wizard')->getSteps()); } - } diff --git a/app/code/core/Mage/Install/Model/Session.php b/app/code/core/Mage/Install/Model/Session.php index 0993cf5f38e..759144a13f7 100644 --- a/app/code/core/Mage/Install/Model/Session.php +++ b/app/code/core/Mage/Install/Model/Session.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_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Install/Model/Wizard.php b/app/code/core/Mage/Install/Model/Wizard.php index 5143d64f8b9..400614176a2 100644 --- a/app/code/core/Mage/Install/Model/Wizard.php +++ b/app/code/core/Mage/Install/Model/Wizard.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_Wizard { diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php index b0b759e573e..9c317a4bea3 100644 --- a/app/code/core/Mage/Install/controllers/WizardController.php +++ b/app/code/core/Mage/Install/controllers/WizardController.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_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 wizard controller + * + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_WizardController extends Mage_Install_Controller_Action { diff --git a/app/code/core/Mage/Install/etc/config.xml b/app/code/core/Mage/Install/etc/config.xml index d2cb4daf817..f74ef4c7577 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml index 59b08f7da4e..3b7fd9720fc 100644 --- a/app/code/core/Mage/Install/etc/install.xml +++ b/app/code/core/Mage/Install/etc/install.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Install * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php index a776c7d24d7..41bce188bf7 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor.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) */ /** diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor.php b/app/code/core/Mage/Log/Model/Resource/Visitor.php index 4585a39add8..bb25e5ff8df 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor.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) */ /** @@ -45,10 +45,6 @@ public function __construct(array $data = []) ? $data['log_condition'] : Mage::helper('log'); } - /** - * Define main table - * - */ protected function _construct() { $this->_init('log/visitor', 'visitor_id'); diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php index cf954226bfb..8ff830c1647 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php @@ -27,10 +27,6 @@ */ class Mage_Log_Model_Resource_Visitor_Online extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define resource - * - */ protected function _construct() { $this->_init('log/visitor_online', 'visitor_id'); diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index ef541b6d243..4b3dd512989 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.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) */ /** diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml index 7cd0a9c0f3f..eba143c9c50 100644 --- a/app/code/core/Mage/Log/etc/config.xml +++ b/app/code/core/Mage/Log/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Log * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/etc/system.xml b/app/code/core/Mage/Log/etc/system.xml index bb6b9071d95..7fdfc5d9858 100644 --- a/app/code/core/Mage/Log/etc/system.xml +++ b/app/code/core/Mage/Log/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@magento.com so we can send you a copy immediately. * - * @category Mage - * @package Mage_Log - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Log + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml index 34f9138081f..539ad558530 100644 --- a/app/code/core/Mage/Media/etc/config.xml +++ b/app/code/core/Mage/Media/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Media * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/Block/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Subscribe.php index 0bbdb9d33f9..0ff5997f640 100644 --- a/app/code/core/Mage/Newsletter/Block/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Subscribe.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) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Newsletter_Block_Subscribe extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php index aad6c61f88d..9b26473cf0d 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.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) */ /** * Newsletter subscriber model for MySQL4 * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team * @deprecated */ class Mage_Newsletter_Model_Mysql4_Subscriber extends Mage_Newsletter_Model_Resource_Subscriber diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php index db29f26b37d..3b006e04b4b 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.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 db resource * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team * @deprecated */ class Mage_Newsletter_Model_Mysql4_Template extends Mage_Newsletter_Model_Resource_Template diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php index b78d456ce3b..b287587a5a8 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php @@ -27,10 +27,6 @@ */ class Mage_Newsletter_Model_Resource_Queue extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('newsletter/queue', 'queue_id'); diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php index 95caa563513..96e12c655da 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.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) */ /** * Newsletter subscriber resource model * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_Model_Resource_Subscriber extends Mage_Core_Model_Resource_Db_Abstract { @@ -56,7 +56,6 @@ class Mage_Newsletter_Model_Resource_Subscriber extends Mage_Core_Model_Resource protected $_messagesScope = 'newsletter/session'; /** - * Initialize resource model * Get tablename from config * */ 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 64019abee49..e39ecb561c0 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php @@ -62,11 +62,6 @@ class Mage_Newsletter_Model_Resource_Subscriber_Collection extends Mage_Core_Mod */ protected $_countFilterPart = []; - /** - * Constructor - * Configures collection - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template.php b/app/code/core/Mage/Newsletter/Model/Resource/Template.php index 1fefbca6757..ea5a9b998bf 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template.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_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) */ /** * Newsletter template resource model * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_Model_Resource_Template extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('newsletter/template', 'template_id'); diff --git a/app/code/core/Mage/Newsletter/Model/Session.php b/app/code/core/Mage/Newsletter/Model/Session.php index aa27b695f5e..6f2a45deb3f 100644 --- a/app/code/core/Mage/Newsletter/Model/Session.php +++ b/app/code/core/Mage/Newsletter/Model/Session.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) */ /** @@ -23,9 +23,8 @@ * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Newsletter_Model_Session extends Mage_Core_Model_Session_Abstract { public function __construct() diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index 1c4e1fd34e6..1453b6bfba0 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.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_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) */ /** * Subscriber model * + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team + * * @method Mage_Newsletter_Model_Resource_Subscriber _getResource() * @method Mage_Newsletter_Model_Resource_Subscriber getResource() * @method string getChangeStatusAt() @@ -45,10 +49,6 @@ * @method bool getImportMode() * @method bool hasCustomerFirstname() * @method bool hasCustomerLastname() - * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team */ class Mage_Newsletter_Model_Subscriber extends Mage_Core_Model_Abstract { @@ -94,9 +94,6 @@ class Mage_Newsletter_Model_Subscriber extends Mage_Core_Model_Abstract */ protected $_isStatusChanged = false; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('newsletter/subscriber'); diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php index f3584242fdf..58438fd1d29 100644 --- a/app/code/core/Mage/Newsletter/Model/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Template.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_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 model * + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team + * * @method Mage_Newsletter_Model_Resource_Template _getResource() * @method Mage_Newsletter_Model_Resource_Template getResource() * @method string getTemplateCode() @@ -47,10 +51,6 @@ * @method $this setModifiedAt(string $value) * @method bool getIsSystem() * @method $this setInlineCssFile(bool|string $value) - * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team */ class Mage_Newsletter_Model_Template extends Mage_Core_Model_Email_Template_Abstract { diff --git a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php index a2874dc7265..5afa64860a8 100644 --- a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php +++ b/app/code/core/Mage/Newsletter/controllers/SubscriberController.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) */ /** * Newsletter subscribe controller * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_SubscriberController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Newsletter/etc/adminhtml.xml b/app/code/core/Mage/Newsletter/etc/adminhtml.xml index a60822c6381..94b83228a06 100644 --- a/app/code/core/Mage/Newsletter/etc/adminhtml.xml +++ b/app/code/core/Mage/Newsletter/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/config.xml b/app/code/core/Mage/Newsletter/etc/config.xml index baa9d402ff1..ab70c2a9793 100644 --- a/app/code/core/Mage/Newsletter/etc/config.xml +++ b/app/code/core/Mage/Newsletter/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Newsletter * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/etc/system.xml b/app/code/core/Mage/Newsletter/etc/system.xml index 867ec5d42d9..1fd10aa9e36 100644 --- a/app/code/core/Mage/Newsletter/etc/system.xml +++ b/app/code/core/Mage/Newsletter/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php index c8253e03ae8..0f7f0ddf13b 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.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/Authorize/Abstract.php b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php index 4757e971316..54647c5885e 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php @@ -52,9 +52,6 @@ abstract class Mage_Oauth_Block_Authorize_Abstract extends Mage_Core_Block_Templ */ protected $_consumer; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Oauth/Model/Resource/Setup.php b/app/code/core/Mage/Oauth/Model/Resource/Setup.php index 5d8217dd5da..c34d828b4e5 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Setup.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Setup.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_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 setup model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Token.php b/app/code/core/Mage/Oauth/Model/Resource/Token.php index 9d36a938b98..c5584388ec3 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token.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_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 token resource model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Model_Resource_Token extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php index 470d4907e80..83829bb21ec 100644 --- a/app/code/core/Mage/Oauth/Model/Token.php +++ b/app/code/core/Mage/Oauth/Model/Token.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_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 token model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team + * * @method string getName() Consumer name (joined from consumer table) * @method Mage_Oauth_Model_Resource_Token_Collection getCollection() * @method Mage_Oauth_Model_Resource_Token_Collection getResourceCollection() diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php index 45db10cb389..03107416247 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.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) */ /** @@ -23,9 +23,9 @@ * * Applications for logged admin user * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Adminhtml_Oauth_Admin_TokenController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php index 9267e46ed2a..3d3adbaff4e 100644 --- a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.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) */ /** @@ -23,9 +23,9 @@ * * Tab "My Applications" in the Customer Account * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Customer_TokenController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Oauth/controllers/TokenController.php b/app/code/core/Mage/Oauth/controllers/TokenController.php index 09d009694a6..e546f734e6f 100644 --- a/app/code/core/Mage/Oauth/controllers/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/TokenController.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_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 token controller * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_TokenController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Oauth/etc/adminhtml.xml b/app/code/core/Mage/Oauth/etc/adminhtml.xml index d7c12d549d5..a4721b948e8 100644 --- a/app/code/core/Mage/Oauth/etc/adminhtml.xml +++ b/app/code/core/Mage/Oauth/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/etc/config.xml b/app/code/core/Mage/Oauth/etc/config.xml index d871d298572..3122280df4a 100644 --- a/app/code/core/Mage/Oauth/etc/config.xml +++ b/app/code/core/Mage/Oauth/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Oauth * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/etc/system.xml b/app/code/core/Mage/Oauth/etc/system.xml index ee0c5021f7f..8eddc9039a8 100644 --- a/app/code/core/Mage/Oauth/etc/system.xml +++ b/app/code/core/Mage/Oauth/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Page/Block/Html/Toplinks.php b/app/code/core/Mage/Page/Block/Html/Toplinks.php index 9a08d8f0e73..f0c6b6b2d1c 100644 --- a/app/code/core/Mage/Page/Block/Html/Toplinks.php +++ b/app/code/core/Mage/Page/Block/Html/Toplinks.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_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) */ /** + * @category Mage + * @package Mage_Page + * @author Magento Core Team + * * @deprecated after 1.4.0.1 */ class Mage_Page_Block_Html_Toplinks extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu.php b/app/code/core/Mage/Page/Block/Html/Topmenu.php index 8db450e8019..35d74864273 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu.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_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) */ /** * Top menu block * - * @category Mage - * @package Mage_Page - * @author Magento Core Team + * @category Mage + * @package Mage_Page + * @author Magento Core Team */ class Mage_Page_Block_Html_Topmenu extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php index 685cf3dff7f..660168891b8 100644 --- a/app/code/core/Mage/Page/Block/Html/Welcome.php +++ b/app/code/core/Mage/Page/Block/Html/Welcome.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/Wrapper.php b/app/code/core/Mage/Page/Block/Html/Wrapper.php index 8163b8bd4e6..22ba34aa200 100644 --- a/app/code/core/Mage/Page/Block/Html/Wrapper.php +++ b/app/code/core/Mage/Page/Block/Html/Wrapper.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_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) */ /** * A generic wrapper block that renders its children and supports a few parameters of the wrapper HTML-element * + * @category Mage + * @package Mage_Page + * @author Magento Core Team + * * @method bool hasElementClass() * @method string getElementClass() * @method bool hasElementId() diff --git a/app/code/core/Mage/Page/Block/Js/Translate.php b/app/code/core/Mage/Page/Block/Js/Translate.php index 880b51b6325..529b2b6cf18 100644 --- a/app/code/core/Mage/Page/Block/Js/Translate.php +++ b/app/code/core/Mage/Page/Block/Js/Translate.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_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) */ /** * Js translation block * + * @category Mage + * @package Mage_Page + * @author Magento Core Team * @deprecated since 1.7.0.0 (used in adminhtml/default/default/layout/main.xml) - * @author Magento Core Team */ class Mage_Page_Block_Js_Translate extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/Block/Switch.php b/app/code/core/Mage/Page/Block/Switch.php index 80d12a39e64..1e432f7d011 100644 --- a/app/code/core/Mage/Page/Block/Switch.php +++ b/app/code/core/Mage/Page/Block/Switch.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_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Page_Block_Switch extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml index 54fb8bf7ec8..e0ce48b4d8b 100644 --- a/app/code/core/Mage/Page/etc/config.xml +++ b/app/code/core/Mage/Page/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Page * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Page/etc/system.xml b/app/code/core/Mage/Page/etc/system.xml index a07b4a08986..9799dfde2de 100644 --- a/app/code/core/Mage/Page/etc/system.xml +++ b/app/code/core/Mage/Page/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/Model/Control/Zend.php b/app/code/core/Mage/PageCache/Model/Control/Zend.php index 002cb861b45..3e81727173c 100644 --- a/app/code/core/Mage/PageCache/Model/Control/Zend.php +++ b/app/code/core/Mage/PageCache/Model/Control/Zend.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) */ /** * Zend server page cache control model * - * @category Mage - * @package Mage_PageCache - * @author Magento Core Team + * @category Mage + * @package Mage_PageCache + * @author Magento Core Team */ class Mage_PageCache_Model_Control_Zend implements Mage_PageCache_Model_Control_Interface { diff --git a/app/code/core/Mage/PageCache/etc/adminhtml.xml b/app/code/core/Mage/PageCache/etc/adminhtml.xml index cf9ce54a937..7dd921bb50c 100644 --- a/app/code/core/Mage/PageCache/etc/adminhtml.xml +++ b/app/code/core/Mage/PageCache/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_PageCache * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/etc/config.xml b/app/code/core/Mage/PageCache/etc/config.xml index 3bfbf7ee7a3..bd8c4ac02d2 100644 --- a/app/code/core/Mage/PageCache/etc/config.xml +++ b/app/code/core/Mage/PageCache/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_PageCache * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/PageCache/etc/system.xml b/app/code/core/Mage/PageCache/etc/system.xml index 7d277969c8e..393fd92f890 100644 --- a/app/code/core/Mage/PageCache/etc/system.xml +++ b/app/code/core/Mage/PageCache/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_PageCache + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/Helper/Data.php b/app/code/core/Mage/Paygate/Helper/Data.php index e92877b3c19..7593f7b271c 100644 --- a/app/code/core/Mage/Paygate/Helper/Data.php +++ b/app/code/core/Mage/Paygate/Helper/Data.php @@ -21,9 +21,9 @@ /** * Paygate data helper * - * @category Mage - * @package Mage_Paygate - * @author Magento Core Team + * @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/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml index ca4f0d7d77f..e97a2800848 100644 --- a/app/code/core/Mage/Paygate/etc/config.xml +++ b/app/code/core/Mage/Paygate/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Paygate * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml index 7a793d69fe4..75ef7df508e 100644 --- a/app/code/core/Mage/Paygate/etc/system.xml +++ b/app/code/core/Mage/Paygate/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index 111b95e2446..337be568054 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -21,9 +21,9 @@ /** * Payment module base helper * - * @category Mage - * @package Mage_Payment - * @author Magento Core Team + * @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/etc/adminhtml.xml b/app/code/core/Mage/Payment/etc/adminhtml.xml index 745ae9e0fcc..b7f73cb6fcf 100644 --- a/app/code/core/Mage/Payment/etc/adminhtml.xml +++ b/app/code/core/Mage/Payment/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/etc/config.xml b/app/code/core/Mage/Payment/etc/config.xml index 57ae81c869b..69ae007be95 100644 --- a/app/code/core/Mage/Payment/etc/config.xml +++ b/app/code/core/Mage/Payment/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Payment * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/etc/system.xml b/app/code/core/Mage/Payment/etc/system.xml index e2120f68120..814f546ca5e 100644 --- a/app/code/core/Mage/Payment/etc/system.xml +++ b/app/code/core/Mage/Payment/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.php index 07a225e0a81..dbc6fc3d697 100644 --- a/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Payment/sql/payment_setup/upgrade-1.6.0.0-1.6.0.1.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_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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $connection->delete( diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php index 368034fa025..1b6304eb0b1 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.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/Store.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php index 9d6122f5c60..4fff5c1b918 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Store.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) */ /** * Renderer for service JavaScript code that disables corresponding paypal methods on page load - * @author Magento Core Team + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Store extends Mage_Adminhtml_Block_Abstract diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php index 7cc18b7e2ba..669b225734b 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.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/Express/Shortcut.php b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php index b8c197746d0..795d1040d58 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php +++ b/app/code/core/Mage/Paypal/Block/Express/Shortcut.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 expess checkout shortcut link * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method string getShortcutHtmlId() * @method string getImageUrl() * @method string getCheckoutUrl() diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php index dc68fd7e0fe..b9c951256eb 100644 --- a/app/code/core/Mage/Paypal/Helper/Data.php +++ b/app/code/core/Mage/Paypal/Helper/Data.php @@ -21,9 +21,9 @@ /** * Paypal Data helper * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @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/Model/Api/Standard.php b/app/code/core/Mage/Paypal/Model/Api/Standard.php index b9828b82c92..e09590252ed 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Api/Standard.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 checkout request API + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Api_Standard extends Mage_Paypal_Model_Api_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php index 5e9fa17cc28..c55aa2c46f0 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.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_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 + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated */ class Mage_Paypal_Model_Mysql4_Report_Settlement extends Mage_Paypal_Model_Resource_Report_Settlement diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php index dc6a29acfd0..8658abf53c2 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.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) */ /** * PayPal Setup Resource class * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated */ class Mage_Paypal_Model_Mysql4_Setup extends Mage_Paypal_Model_Resource_Setup diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php index d77855de9c6..73e11261f99 100644 --- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.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_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) */ /** * Payment transaction model * Tracks transaction history * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method Mage_Paypal_Model_Resource_Payment_Transaction _getResource() * @method Mage_Paypal_Model_Resource_Payment_Transaction getResource() * @method string getTxnId() * @method string getCreatedAt() * @method Mage_Paypal_Model_Payment_Transaction setCreatedAt(string $value) - * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Payment_Transaction extends Mage_Core_Model_Abstract { @@ -42,16 +42,12 @@ class Mage_Paypal_Model_Payment_Transaction extends Mage_Core_Model_Abstract protected $_isFailsafe = false; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventPrefix * @var string */ protected $_eventPrefix = 'paypal_payment_transaction'; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventObject * @var string */ diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php index 937af2d5c54..d974528ad23 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.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,8 +24,10 @@ * Perform fetching reports from remote servers with following saving them to database * Prepare report rows for Mage_Paypal_Model_Report_Settlement_Row model * - */ -/** + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method Mage_Paypal_Model_Resource_Report_Settlement _getResource() * @method Mage_Paypal_Model_Resource_Report_Settlement getResource() * @method string getReportDate() @@ -36,10 +38,6 @@ * @method Mage_Paypal_Model_Report_Settlement setFilename(string $value) * @method string getLastModified() * @method Mage_Paypal_Model_Report_Settlement setLastModified(string $value) - * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract { @@ -159,9 +157,7 @@ class Mage_Paypal_Model_Report_Settlement extends Mage_Core_Model_Abstract ] ] ]; - /** - * Initialize resource model - */ + protected function _construct() { $this->_init('paypal/report_settlement'); diff --git a/app/code/core/Mage/Paypal/Model/Resource/Cert.php b/app/code/core/Mage/Paypal/Model/Resource/Cert.php index de76232fdbd..4b217140570 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Cert.php @@ -27,9 +27,6 @@ */ class Mage_Paypal_Model_Resource_Cert extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection - */ protected function _construct() { $this->_init('paypal/cert', 'cert_id'); diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php index 6c474449444..3dd07665dc3 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.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_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 transaction resource model * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated since 1.6.2.0 - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Resource_Payment_Transaction extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php index 6ab95e85a2d..28f8422a6fb 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.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) */ /** * Report settlement resource model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Resource_Report_Settlement extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Resource/Setup.php b/app/code/core/Mage/Paypal/Model/Resource/Setup.php index 5875cb4e8f9..85792fec08a 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Setup.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) */ /** * PayPal Setup Resource class * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/Paypal/Model/Session.php b/app/code/core/Mage/Paypal/Model/Session.php index 1d498eea4c2..2e3a6f46fe8 100644 --- a/app/code/core/Mage/Paypal/Model/Session.php +++ b/app/code/core/Mage/Paypal/Model/Session.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 transaction session namespace * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/Standard.php b/app/code/core/Mage/Paypal/Model/Standard.php index 5b020b3bd41..40602d12c38 100644 --- a/app/code/core/Mage/Paypal/Model/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Standard.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 Standard Checkout Module * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Standard extends Mage_Payment_Model_Method_Abstract { diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php index 342f7b18aa5..93ee0e370c3 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/UrlMethod.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 url method: GET/POST + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_UrlMethod { /** - * Options getter - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php index 61e99ab6337..284ec5bc431 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/YesnoShortcut.php @@ -12,21 +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) */ /** * Used in creating options for Yes|No config value selection * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_YesnoShortcut { /** - * Options getter - * * @return array */ public function toOptionArray() @@ -36,6 +37,5 @@ public function toOptionArray() ['value' => 0, 'label' => Mage::helper('paypal')->__('No')], ]; } - } diff --git a/app/code/core/Mage/Paypal/UnavailableException.php b/app/code/core/Mage/Paypal/UnavailableException.php index ac7ced50194..f111c0aac12 100644 --- a/app/code/core/Mage/Paypal/UnavailableException.php +++ b/app/code/core/Mage/Paypal/UnavailableException.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_UnavailableException extends Mage_Core_Exception { - } diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php index 651289d2bf1..0b0dfdc1d47 100644 --- a/app/code/core/Mage/Paypal/controllers/StandardController.php +++ b/app/code/core/Mage/Paypal/controllers/StandardController.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_StandardController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Paypal/etc/adminhtml.xml b/app/code/core/Mage/Paypal/etc/adminhtml.xml index 9859a294861..e5c4cac103b 100644 --- a/app/code/core/Mage/Paypal/etc/adminhtml.xml +++ b/app/code/core/Mage/Paypal/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/etc/config.xml b/app/code/core/Mage/Paypal/etc/config.xml index 07bb35c38ed..3d2d9510555 100644 --- a/app/code/core/Mage/Paypal/etc/config.xml +++ b/app/code/core/Mage/Paypal/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Paypal * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml index fa6c03181c7..09616f77b57 100644 --- a/app/code/core/Mage/Paypal/etc/system.xml +++ b/app/code/core/Mage/Paypal/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php index 39e7256dc5e..61c35ac4499 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/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_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 */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php index 8708197bf00..a01199d41df 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.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_Paypal_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php index f3fd1c94f3f..124cd78b15b 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.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_Paypal_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php b/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php index 160a231d4c7..d19b09df07b 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.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) */ /** * Paypal expess checkout shortcut link + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Block_Express_Shortcut extends Mage_Paypal_Block_Express_Shortcut { diff --git a/app/code/core/Mage/PaypalUk/Helper/Data.php b/app/code/core/Mage/PaypalUk/Helper/Data.php index 0417742811c..9bda1a31c15 100644 --- a/app/code/core/Mage/PaypalUk/Helper/Data.php +++ b/app/code/core/Mage/PaypalUk/Helper/Data.php @@ -21,9 +21,9 @@ /** * PaypalUk data helper * - * @category Mage - * @package Mage_PaypalUk - * @author Magento Core Team + * @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/Session.php b/app/code/core/Mage/PaypalUk/Model/Session.php index 61c1aeb419e..81133556460 100644 --- a/app/code/core/Mage/PaypalUk/Model/Session.php +++ b/app/code/core/Mage/PaypalUk/Model/Session.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_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 transaction session namespace * - * @author Magento Core Team + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/PaypalUk/etc/config.xml b/app/code/core/Mage/PaypalUk/etc/config.xml index af5123f1ec5..285023077b0 100644 --- a/app/code/core/Mage/PaypalUk/etc/config.xml +++ b/app/code/core/Mage/PaypalUk/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_PaypalUk * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/Helper/Session.php b/app/code/core/Mage/Persistent/Helper/Session.php index 23ed71fa0f0..d3793619d0f 100644 --- a/app/code/core/Mage/Persistent/Helper/Session.php +++ b/app/code/core/Mage/Persistent/Helper/Session.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/Model/Observer/Session.php b/app/code/core/Mage/Persistent/Model/Observer/Session.php index 93487810ce0..f99450f2c04 100644 --- a/app/code/core/Mage/Persistent/Model/Observer/Session.php +++ b/app/code/core/Mage/Persistent/Model/Observer/Session.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/Model/Resource/Session.php b/app/code/core/Mage/Persistent/Model/Resource/Session.php index 1793bb02d74..f083ad3a78d 100644 --- a/app/code/core/Mage/Persistent/Model/Resource/Session.php +++ b/app/code/core/Mage/Persistent/Model/Resource/Session.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_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) */ /** * Persistent Session Resource Model * - * @category Mage - * @package Mage_Persistent - * @author Magento Core Team + * @category Mage + * @package Mage_Persistent + * @author Magento Core Team */ class Mage_Persistent_Model_Resource_Session extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,9 +34,6 @@ class Mage_Persistent_Model_Resource_Session extends Mage_Core_Model_Resource_Db */ protected $_useIsObjectNew = true; - /** - * Initialize connection and define main table and primary key - */ protected function _construct() { $this->_init('persistent/session', 'persistent_id'); diff --git a/app/code/core/Mage/Persistent/Model/Session.php b/app/code/core/Mage/Persistent/Model/Session.php index acac0123a88..3eb32938a13 100644 --- a/app/code/core/Mage/Persistent/Model/Session.php +++ b/app/code/core/Mage/Persistent/Model/Session.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/etc/adminhtml.xml b/app/code/core/Mage/Persistent/etc/adminhtml.xml index 8129ecc2c62..da601bcabd9 100644 --- a/app/code/core/Mage/Persistent/etc/adminhtml.xml +++ b/app/code/core/Mage/Persistent/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/config.xml b/app/code/core/Mage/Persistent/etc/config.xml index c2b654b1d47..eea8e8403cb 100644 --- a/app/code/core/Mage/Persistent/etc/config.xml +++ b/app/code/core/Mage/Persistent/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/persistent.xml b/app/code/core/Mage/Persistent/etc/persistent.xml index d188cc81c11..ce8b788380c 100644 --- a/app/code/core/Mage/Persistent/etc/persistent.xml +++ b/app/code/core/Mage/Persistent/etc/persistent.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Persistent * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/etc/system.xml b/app/code/core/Mage/Persistent/etc/system.xml index 793bee7fcf4..501fd97db57 100644 --- a/app/code/core/Mage/Persistent/etc/system.xml +++ b/app/code/core/Mage/Persistent/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/Helper/Data.php b/app/code/core/Mage/Poll/Helper/Data.php index 684437b57c0..4682ab7872f 100644 --- a/app/code/core/Mage/Poll/Helper/Data.php +++ b/app/code/core/Mage/Poll/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Poll - * @author Magento Core Team + * @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/Model/Mysql4/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php index 671e3a5ef51..38ab67ca286 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.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_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 vote resource model * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team + * @category Mage + * @package Mage_Poll + * @author Magento Core Team * @deprecated */ class Mage_Poll_Model_Mysql4_Poll_Vote extends Mage_Poll_Model_Resource_Poll_Vote diff --git a/app/code/core/Mage/Poll/Model/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Poll/Vote.php index 38d40b8abd5..4f752409b73 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Poll/Vote.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_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) */ /** * Pool vote model * + * @category Mage + * @package Mage_Poll + * @author Magento Core Team + * * @method Mage_Poll_Model_Resource_Poll_Vote _getResource() * @method Mage_Poll_Model_Resource_Poll_Vote getResource() * @@ -34,10 +38,6 @@ * @method $this setCustomerId(int $value) * @method string getVoteTime() * @method $this setVoteTime(string $value) - * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team */ class Mage_Poll_Model_Poll_Vote extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php index e0fdbf4d6f0..1ff2cc91ee9 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.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_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 vote resource model * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team + * @category Mage + * @package Mage_Poll + * @author Magento Core Team */ class Mage_Poll_Model_Resource_Poll_Vote extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Poll/controllers/VoteController.php b/app/code/core/Mage/Poll/controllers/VoteController.php index e4425c77ad0..6a654d478b2 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.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_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 vote controller * - * @file Vote.php - * @author Magento Core Team + * @category Mage + * @package Mage_Poll + * @author Magento Core Team */ - class Mage_Poll_VoteController extends Mage_Core_Controller_Front_Action { /** diff --git a/app/code/core/Mage/Poll/etc/adminhtml.xml b/app/code/core/Mage/Poll/etc/adminhtml.xml index 7d4ff977d50..7669b99e6b7 100644 --- a/app/code/core/Mage/Poll/etc/adminhtml.xml +++ b/app/code/core/Mage/Poll/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/config.xml b/app/code/core/Mage/Poll/etc/config.xml index 5a33d00c2b4..9d9c578291d 100644 --- a/app/code/core/Mage/Poll/etc/config.xml +++ b/app/code/core/Mage/Poll/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Poll * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Poll/etc/system.xml b/app/code/core/Mage/Poll/etc/system.xml index 7ca21367152..fa761de1ea1 100644 --- a/app/code/core/Mage/Poll/etc/system.xml +++ b/app/code/core/Mage/Poll/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php index 14b799bc652..0e5ba4a59e5 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Stock.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,14 +23,10 @@ * * @category Mage * @package Mage_ProductAlert - * @author Magento Core Team + * @author Magento Core Team */ class Mage_ProductAlert_Block_Email_Stock extends Mage_ProductAlert_Block_Email_Abstract { - /** - * Constructor - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ProductAlert/Block/Product/View.php b/app/code/core/Mage/ProductAlert/Block/Product/View.php index fe276bf9b66..02ffa76c203 100644 --- a/app/code/core/Mage/ProductAlert/Block/Product/View.php +++ b/app/code/core/Mage/ProductAlert/Block/Product/View.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_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) */ /** * Product view price and stock alerts + * + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team + * * @method $this setSignupUrl(string $value) */ class Mage_ProductAlert_Block_Product_View extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/ProductAlert/Block/Stock.php b/app/code/core/Mage/ProductAlert/Block/Stock.php index 483014fdb07..2cfd8ade5ac 100644 --- a/app/code/core/Mage/ProductAlert/Block/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Stock.php @@ -12,13 +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) */ /** + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team * @deprecated after 1.4.1.0 * @see Mage_ProductAlert_Block_Product_View */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php index b2306c60c55..a447fba7f6d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.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_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) */ /** * Product alert for back in stock resource model * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team * @deprecated */ class Mage_ProductAlert_Model_Mysql4_Stock extends Mage_ProductAlert_Model_Resource_Stock diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php index 24cc45d486e..37f71c6f43d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php @@ -27,10 +27,6 @@ */ class Mage_ProductAlert_Model_Resource_Price extends Mage_ProductAlert_Model_Resource_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('productalert/price', 'alert_price_id'); diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php index 001648f2684..edaf0eb4f79 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.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_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) */ /** * Product alert for back in stock resource model * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team */ class Mage_ProductAlert_Model_Resource_Stock extends Mage_ProductAlert_Model_Resource_Abstract { - /** - * Initialize connection - * - */ protected function _construct() { $this->_init('productalert/stock', 'alert_stock_id'); diff --git a/app/code/core/Mage/ProductAlert/Model/Stock.php b/app/code/core/Mage/ProductAlert/Model/Stock.php index 0f37f5ed03c..fe84e378f07 100644 --- a/app/code/core/Mage/ProductAlert/Model/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Stock.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_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 for back in stock model * + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team + * * @method Mage_ProductAlert_Model_Resource_Stock _getResource() * @method Mage_ProductAlert_Model_Resource_Stock getResource() * @method Mage_ProductAlert_Model_Resource_Stock_Collection getCollection() @@ -39,10 +43,6 @@ * @method $this setSendCount(int $value) * @method int getStatus() * @method $this setStatus(int $value) - * - * @category Mage - * @package Mage_ProductAlert - * @author Magento Core Team */ class Mage_ProductAlert_Model_Stock extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php index 8ad4ed506f2..d279981d338 100644 --- a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php +++ b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.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_UnsubscribeController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml index 10bbf9aaaa3..f2d4dcb4d3f 100644 --- a/app/code/core/Mage/ProductAlert/etc/config.xml +++ b/app/code/core/Mage/ProductAlert/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_ProductAlert * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml index 4a4dc568eee..3600b2f9467 100644 --- a/app/code/core/Mage/ProductAlert/etc/system.xml +++ b/app/code/core/Mage/ProductAlert/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/Helper/Data.php b/app/code/core/Mage/Rating/Helper/Data.php index 23ab7ab656f..8b6a84f14b6 100644 --- a/app/code/core/Mage/Rating/Helper/Data.php +++ b/app/code/core/Mage/Rating/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @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/Option/Vote.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php index 68a847f5712..ea543a0ea80 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote.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 vote resource model * - * @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_Option_Vote extends Mage_Rating_Model_Resource_Rating_Option_Vote diff --git a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php index fddfe910ca2..cd18b5a2684 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.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,14 +23,13 @@ * * @category Mage * @package Mage_Rating - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Rating_Model_Resource_Rating_Option_Vote_Collection getResourceCollection() * @method string getEntityPkValue() * @method int getRatingId() * @method $this setRatingOptions(Mage_Rating_Model_Resource_Rating_Option_Collection $options) */ - class Mage_Rating_Model_Rating_Option_Vote extends Mage_Core_Model_Abstract { public function __construct() diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php index c2d7eb72e4b..d2ccfbf7b66 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote.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_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 vote resource model * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @category Mage + * @package Mage_Rating + * @author Magento Core Team */ class Mage_Rating_Model_Resource_Rating_Option_Vote extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('rating/rating_option_vote', 'vote_id'); diff --git a/app/code/core/Mage/Rating/etc/adminhtml.xml b/app/code/core/Mage/Rating/etc/adminhtml.xml index c8dffaa844b..ca6817e1ee3 100644 --- a/app/code/core/Mage/Rating/etc/adminhtml.xml +++ b/app/code/core/Mage/Rating/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml index 57424ccdf1e..bd6435b3a65 100644 --- a/app/code/core/Mage/Rating/etc/config.xml +++ b/app/code/core/Mage/Rating/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rating * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/Block/Product/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php index 5b08e97ab6b..88ce3c3d4df 100644 --- a/app/code/core/Mage/Reports/Block/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Viewed.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/Block/Product/Widget/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php index 84abdf8780a..9cd7da3f5b6 100644 --- a/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.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) */ /** @@ -27,10 +27,6 @@ */ class Mage_Reports_Block_Product_Widget_Viewed extends Mage_Reports_Block_Product_Viewed implements Mage_Widget_Block_Interface { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index 5f0c5206a88..08c9a04f227 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @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 39b8bacfb5d..26469f42569 100644 --- a/app/code/core/Mage/Reports/Model/Event.php +++ b/app/code/core/Mage/Reports/Model/Event.php @@ -21,9 +21,9 @@ /** * Events model * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @category Mage + * @package Mage_Reports + * @author Magento Core Team * * @method Mage_Reports_Model_Resource_Event _getResource() * @method Mage_Reports_Model_Resource_Event getResource() diff --git a/app/code/core/Mage/Reports/Model/Event/Type.php b/app/code/core/Mage/Reports/Model/Event/Type.php index bdaa4994ccc..1d1637207fb 100644 --- a/app/code/core/Mage/Reports/Model/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Event/Type.php @@ -12,27 +12,26 @@ * obtain it through 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) */ /** * Event type model * + * @category Mage + * @package Mage_Reports + * @author Magento Core Team + * * @method Mage_Reports_Model_Resource_Event_Type _getResource() * @method Mage_Reports_Model_Resource_Event_Type getResource() * @method string getEventName() * @method Mage_Reports_Model_Event_Type setEventName(string $value) * @method int getCustomerLogin() * @method Mage_Reports_Model_Event_Type setCustomerLogin(int $value) - * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team */ - class Mage_Reports_Model_Event_Type extends Mage_Core_Model_Abstract { protected function _construct() diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php index 73b59e17e93..dd00fc6b981 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.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 event type 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_Type extends Mage_Reports_Model_Resource_Event_Type diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php index 0433e11f0e5..4d03b0169d1 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.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) */ /** * Reports Viewed Product Index 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_Product_Index_Viewed extends Mage_Reports_Model_Resource_Product_Index_Viewed diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php index 89876acba1a..fb8f1e68599 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.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_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) */ /** * Catalog Viewed Product Index * + * @category Mage + * @package Mage_Reports + * @author Magento Core Team + * * @method Mage_Reports_Model_Resource_Product_Index_Viewed _getResource() * @method Mage_Reports_Model_Resource_Product_Index_Viewed getResource() * @method Mage_Reports_Model_Product_Index_Viewed setVisitorId(int $value) @@ -30,10 +34,6 @@ * @method Mage_Reports_Model_Product_Index_Viewed setStoreId(int $value) * @method string getAddedAt() * @method Mage_Reports_Model_Product_Index_Viewed setAddedAt(string $value) - * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team */ class Mage_Reports_Model_Product_Index_Viewed extends Mage_Reports_Model_Product_Index_Abstract { diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type.php index aec2ce99f93..cd5a2287faf 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type.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_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 event type 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_Type extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Main table initialization - * - */ protected function _construct() { $this->_init('reports/event_type', 'event_type_id'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php index 6d7b8b14baa..11515b63861 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared.php @@ -27,10 +27,6 @@ */ class Mage_Reports_Model_Resource_Product_Index_Compared extends Mage_Reports_Model_Resource_Product_Index_Abstract { - /** - * Initialize connection and main resource table - * - */ protected function _construct() { $this->_init('reports/compared_product_index', 'index_id'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php index 2402dc9d2a1..3db99e7662f 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed.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_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 Viewed Product Index 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_Product_Index_Viewed extends Mage_Reports_Model_Resource_Product_Index_Abstract { - /** - * Initialize connection and main resource table - * - */ protected function _construct() { $this->_init('reports/viewed_product_index', 'index_id'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php index 6877ede7ac6..79365962df8 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.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) */ /** * Most viewed product report aggregate 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_Report_Product_Viewed extends Mage_Sales_Model_Resource_Report_Abstract { @@ -31,10 +31,6 @@ class Mage_Reports_Model_Resource_Report_Product_Viewed extends Mage_Sales_Model const AGGREGATION_MONTHLY = 'reports/viewed_aggregated_monthly'; const AGGREGATION_YEARLY = 'reports/viewed_aggregated_yearly'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init(self::AGGREGATION_DAILY, 'id'); diff --git a/app/code/core/Mage/Reports/Model/Session.php b/app/code/core/Mage/Reports/Model/Session.php index 920f0625156..93549c7cf11 100644 --- a/app/code/core/Mage/Reports/Model/Session.php +++ b/app/code/core/Mage/Reports/Model/Session.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/Test.php b/app/code/core/Mage/Reports/Model/Test.php index 1bd0ce7c9bd..c35711bc0e2 100644 --- a/app/code/core/Mage/Reports/Model/Test.php +++ b/app/code/core/Mage/Reports/Model/Test.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) */ /** @@ -23,12 +23,10 @@ * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Reports_Model_Test extends Varien_Object { - /** * @return false|string */ diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php index 0fd6cfca9c6..002f06ca0b1 100644 --- a/app/code/core/Mage/Reports/Model/Totals.php +++ b/app/code/core/Mage/Reports/Model/Totals.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Reports_Model_Totals { diff --git a/app/code/core/Mage/Reports/etc/adminhtml.xml b/app/code/core/Mage/Reports/etc/adminhtml.xml index 48f706d6bbd..053bdfc9bfc 100644 --- a/app/code/core/Mage/Reports/etc/adminhtml.xml +++ b/app/code/core/Mage/Reports/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml index a8bb8ceb3bc..406d4a6e5ad 100644 --- a/app/code/core/Mage/Reports/etc/config.xml +++ b/app/code/core/Mage/Reports/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Reports * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml index f0d65824ac1..6c0a1379732 100644 --- a/app/code/core/Mage/Reports/etc/system.xml +++ b/app/code/core/Mage/Reports/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/etc/widget.xml b/app/code/core/Mage/Reports/etc/widget.xml index 60cca66f695..60c1328d3b5 100644 --- a/app/code/core/Mage/Reports/etc/widget.xml +++ b/app/code/core/Mage/Reports/etc/widget.xml @@ -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_Reports - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php index 591aac18987..26fc007ec22 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/upgrade-1.6.0.0-1.6.0.0.1.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_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(); $aggregationTables = [ diff --git a/app/code/core/Mage/Review/Block/Customer/View.php b/app/code/core/Mage/Review/Block/Customer/View.php index f9091beb7b0..28c3ace359d 100644 --- a/app/code/core/Mage/Review/Block/Customer/View.php +++ b/app/code/core/Mage/Review/Block/Customer/View.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 string getReviewId() * @method $this setReviewId(string $value) diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php index 6bf333a80ac..64cbc4bf5ac 100644 --- a/app/code/core/Mage/Review/Block/Product/View.php +++ b/app/code/core/Mage/Review/Block/Product/View.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/Block/View.php b/app/code/core/Mage/Review/Block/View.php index 9aff1bbbcf3..0e342076eb1 100644 --- a/app/code/core/Mage/Review/Block/View.php +++ b/app/code/core/Mage/Review/Block/View.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 Mage_Rating_Model_Resource_Rating_Option_Vote_Collection|false getRatingCollection() * @method $this setRatingCollection(Mage_Rating_Model_Resource_Rating_Option_Vote_Collection|false $value) diff --git a/app/code/core/Mage/Review/Helper/Data.php b/app/code/core/Mage/Review/Helper/Data.php index 81cdaf6c131..17dd3bc27b3 100644 --- a/app/code/core/Mage/Review/Helper/Data.php +++ b/app/code/core/Mage/Review/Helper/Data.php @@ -21,9 +21,9 @@ /** * Default review helper * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @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/Model/Mysql4/Review/Summary.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php index ff5b08711ea..2cb0046e6cc 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.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_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) */ /** * Review summary resource model * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team * @deprecated */ class Mage_Review_Model_Mysql4_Review_Summary extends Mage_Review_Model_Resource_Review_Summary diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php index 8f2ae1f7bc8..c10b8743904 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review.php +++ b/app/code/core/Mage/Review/Model/Resource/Review.php @@ -78,7 +78,6 @@ class Mage_Review_Model_Resource_Review extends Mage_Core_Model_Resource_Db_Abst /** * Define main table. Define other tables name - * */ protected function _construct() { diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Status.php b/app/code/core/Mage/Review/Model/Resource/Review/Status.php index 467888d918f..12c791ca7b2 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Status.php @@ -12,26 +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_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) */ /** * Review status resource model * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team */ class Mage_Review_Model_Resource_Review_Status extends Mage_Core_Model_Resource_Db_Abstract { - - /** - * Resource status model initialization - * - */ protected function _construct() { $this->_init('review/review_status', 'status_id'); diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php index 64646a58a05..d4d6d78b1c1 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary.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_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) */ /** * Review summary resource model * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team */ class Mage_Review_Model_Resource_Review_Summary extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Review/Model/Review/Status.php b/app/code/core/Mage/Review/Model/Review/Status.php index 52b1e4f0b2f..fc9afa03155 100644 --- a/app/code/core/Mage/Review/Model/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Review/Status.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,12 +23,10 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Review_Model_Review_Status extends Mage_Core_Model_Abstract { - public function __construct() { $this->_init('review/review_status'); diff --git a/app/code/core/Mage/Review/Model/Review/Summary.php b/app/code/core/Mage/Review/Model/Review/Summary.php index fc8675143df..1d05fba0275 100644 --- a/app/code/core/Mage/Review/Model/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Review/Summary.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,13 +23,12 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team * * @method $this setStoreId(int $value) */ class Mage_Review_Model_Review_Summary extends Mage_Core_Model_Abstract { - public function __construct() { $this->_init('review/review_summary'); diff --git a/app/code/core/Mage/Review/Model/Session.php b/app/code/core/Mage/Review/Model/Session.php index c1684ac1815..f3c54c5dac9 100644 --- a/app/code/core/Mage/Review/Model/Session.php +++ b/app/code/core/Mage/Review/Model/Session.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 array getFormData() * @method $this setFormData(array $value) diff --git a/app/code/core/Mage/Review/etc/adminhtml.xml b/app/code/core/Mage/Review/etc/adminhtml.xml index de74df73fac..bb1007c80fe 100644 --- a/app/code/core/Mage/Review/etc/adminhtml.xml +++ b/app/code/core/Mage/Review/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml index a866e670aa9..c8db6caccb6 100644 --- a/app/code/core/Mage/Review/etc/config.xml +++ b/app/code/core/Mage/Review/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Review * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/etc/system.xml b/app/code/core/Mage/Review/etc/system.xml index e2cca1c4b14..d4df9f20373 100644 --- a/app/code/core/Mage/Review/etc/system.xml +++ b/app/code/core/Mage/Review/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php index 2d9065020a8..7c08e8d88b3 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Special.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Special.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Catalog_Special extends Mage_Rss_Block_Catalog_Abstract { diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php index 5f4ef4d0a3b..6688bf17ff1 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Catalog_Tag extends Mage_Rss_Block_Catalog_Abstract { diff --git a/app/code/core/Mage/Rss/Block/Order/Status.php b/app/code/core/Mage/Rss/Block/Order/Status.php index 842171a48f6..c34b486e641 100644 --- a/app/code/core/Mage/Rss/Block/Order/Status.php +++ b/app/code/core/Mage/Rss/Block/Order/Status.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Order_Status extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php index 19a39984287..17902ff1ee9 100644 --- a/app/code/core/Mage/Rss/Block/Wishlist.php +++ b/app/code/core/Mage/Rss/Block/Wishlist.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/Model/Session.php b/app/code/core/Mage/Rss/Model/Session.php index 09e95d30133..c19d3e65257 100644 --- a/app/code/core/Mage/Rss/Model/Session.php +++ b/app/code/core/Mage/Rss/Model/Session.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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Admin_Model_User getAdmin() * @method Mage_Customer_Model_Customer getCustomer() diff --git a/app/code/core/Mage/Rss/etc/adminhtml.xml b/app/code/core/Mage/Rss/etc/adminhtml.xml index 2bfd6cf6094..a15d07b9720 100644 --- a/app/code/core/Mage/Rss/etc/adminhtml.xml +++ b/app/code/core/Mage/Rss/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml index c161c60b10d..13eb457d1d8 100644 --- a/app/code/core/Mage/Rss/etc/config.xml +++ b/app/code/core/Mage/Rss/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rss * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rss/etc/system.xml b/app/code/core/Mage/Rss/etc/system.xml index 21c3c2082c2..7e0bf63fab6 100644 --- a/app/code/core/Mage/Rss/etc/system.xml +++ b/app/code/core/Mage/Rss/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rule/Helper/Data.php b/app/code/core/Mage/Rule/Helper/Data.php index 14f623c0311..1f7476b40a4 100644 --- a/app/code/core/Mage/Rule/Helper/Data.php +++ b/app/code/core/Mage/Rule/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Rule - * @author Magento Core Team + * @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/Resource/Rule/Condition/SqlBuilder.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php index 3d281228993..343608af991 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Condition/SqlBuilder.php @@ -12,24 +12,26 @@ * obtain it through 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_Model_Resource_Rule_Condition_SqlBuilder { /** * Database adapter - * * @var Varien_Db_Adapter_Interface */ protected $_adapter; /** - * Constructor - * * @param array $config */ public function __construct(array $config = []) diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml index 6ef6904a9b8..38f49127356 100644 --- a/app/code/core/Mage/Rule/etc/config.xml +++ b/app/code/core/Mage/Rule/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Rule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php index 50ddb9e7b7f..b555c7f63c7 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View.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 * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_View extends Mage_Adminhtml_Block_Widget_Form_Container { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php index 2fae2d30d9c..d491fa77140 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tabs.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_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 tabs view * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_View_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Initialize tab - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php index 1b1b42abe5d..466fb010dce 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View.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 view page * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method string getDestElementId() * @method $this setViewHtml(string $value) */ diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php index e1ad0ac4112..bb2b3879b73 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.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) */ /** * Customer account billing agreement view block * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * * @method $this setAgreementCreatedAt(string $value) * @method $this setAgreementUpdatedAt(string $value) diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php index 6d308a145e6..6008ff025b2 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.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_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_Block_Order_Creditmemo_Totals extends Mage_Sales_Block_Order_Totals { diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php index a72cb7bb123..261fff91adf 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.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_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_Block_Order_Invoice_Totals extends Mage_Sales_Block_Order_Totals { diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php index 47715f3d2b6..32b39785600 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.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_Order_Print_Shipment extends Mage_Sales_Block_Items_Abstract { /** diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php index 9eb87ee0dc1..a95cd1bcdbe 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Block_Order_Shipment extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/Tax.php b/app/code/core/Mage/Sales/Block/Order/Tax.php index f73dd376357..d92d264cfb4 100644 --- a/app/code/core/Mage/Sales/Block/Order/Tax.php +++ b/app/code/core/Mage/Sales/Block/Order/Tax.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_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 order view tax block * - * @deprecated after 1.3.2.2 * @category Mage * @package Mage_Sales * @author Magento Core Team + * @deprecated after 1.3.2.2 */ class Mage_Sales_Block_Order_Tax extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/Totals.php b/app/code/core/Mage/Sales/Block/Order/Totals.php index dc5235d250b..c7742fc2970 100644 --- a/app/code/core/Mage/Sales/Block/Order/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Totals.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_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_Block_Order_Totals extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php index 379b3770e4e..eaca59540df 100644 --- a/app/code/core/Mage/Sales/Block/Order/View.php +++ b/app/code/core/Mage/Sales/Block/Order/View.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Block_Order_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php index c63320c4a94..18e5d04bc4d 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.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) */ /** * Recurring profile view + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Recurring_Profile_View extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php index 8d4e08089cb..19050e31528 100644 --- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php +++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php @@ -12,22 +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_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 order view block * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method int getCustomerId() * @method Mage_Sales_Model_Resource_Order_Collection getOrders() * @method $this setOrders(Mage_Sales_Model_Resource_Order_Collection $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Block_Reorder_Sidebar extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php index 24483393aaf..aacf26f9312 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.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/Api2/Order/Address/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php index 04e24a7e9b2..48bc084cb5a 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Customer/V1.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/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php index fa60026b64a..664dfdb73d7 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.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/Api2/Order/Comment/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php index 79c6450565b..4297e7b4ccd 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Customer/V1.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/Api2/Order/Item/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php index 2199d0c7931..568e131c3f4 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Admin/V1.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/Api2/Order/Item/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php index a6d0ec35200..edb0ae75bb8 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest/Customer/V1.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/Api2/Order/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php index ef4bd514121..9bc6b98975e 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Admin/V1.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/Api2/Order/Rest/Customer/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php index de13f146de7..5e0f69b9ae6 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest/Customer/V1.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/Email/Template.php b/app/code/core/Mage/Sales/Model/Email/Template.php index 4fbd4018c37..849eac4124b 100644 --- a/app/code/core/Mage/Sales/Model/Email/Template.php +++ b/app/code/core/Mage/Sales/Model/Email/Template.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_Email_Template extends Mage_Core_Model_Email_Template { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php index ffe33fb9829..73244a14c82 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.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_Model_Entity_Order_Attribute_Backend_Shipping extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php index d7f9d370b55..11dc7ad0d96 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.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_Model_Entity_Order_Shipment extends Mage_Eav_Model_Entity_Abstract { public function __construct() diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php index 1920a72df27..1968ddca74b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Order_Shipment_Track extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php index ac5c448e9cd..0c3a446d28c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php index 399ce193e77..90363fddb3f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.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_Shipping extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php index 47309b88942..7317c3b6684 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.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_Subtotal extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php index e85ed1b7a10..1da4c91b06a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.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_Tax extends Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Setup.php b/app/code/core/Mage/Sales/Model/Entity/Setup.php index 2f403b19006..a4656c2c898 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Setup.php +++ b/app/code/core/Mage/Sales/Model/Entity/Setup.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_Setup extends Mage_Eav_Model_Entity_Setup { /** diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php index 0bc9943b005..868ac0a4fc7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Shipping.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 shipping address backend * - * @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_Attribute_Backend_Shipping extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php index 7483200b387..e9668733c59 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction.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 transaction resource model * - * @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_Payment_Transaction extends Mage_Sales_Model_Resource_Order_Payment_Transaction diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php index 94339091c83..dfd81e8ffe8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.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 shipment 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_Shipment extends Mage_Sales_Model_Resource_Order_Shipment diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php index c8f4a0c5c0c..b8200f6250e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track.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 shipment comment 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_Shipment_Track extends Mage_Sales_Model_Resource_Order_Shipment_Track diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php index 7f464364184..abd14d33f6e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.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) */ /** * Order status resource model + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Order_Status extends Mage_Sales_Model_Resource_Order_Status diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php index 57c892f02e2..d18e6a516d8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.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_Order_Tax extends Mage_Sales_Model_Resource_Order_Tax diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php index 397061bee50..b9028f9cd8a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Shipping.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_Shipping extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php index e2c3f3252b7..f99fa49d4c0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Subtotal.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_Subtotal extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php index 3f5cf396dbc..debc2f9d2d8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Tax.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_Tax extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php index d41899f0b94..1e569efb5d0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.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_Report_Shipping extends Mage_Sales_Model_Resource_Report_Shipping diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php index 696eacaa3d2..7f977087232 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Shipment.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 report shipping collection * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * @deprecated */ class Mage_Sales_Model_Mysql4_Report_Shipping_Collection_Shipment extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php index 6bdc94f043b..5d53e927677 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.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_Setup extends Mage_Sales_Model_Resource_Setup diff --git a/app/code/core/Mage/Sales/Model/Order/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Api/V2.php index 8d503ae4004..eec2c2046d5 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Api/V2.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/Config.php b/app/code/core/Mage/Sales/Model/Order/Config.php index a2dea4471da..05c022a6c8c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Config.php @@ -41,9 +41,6 @@ class Mage_Sales_Model_Order_Config extends Mage_Core_Model_Config_Base */ private $_states; - /** - * Constructor - */ public function __construct() { parent::__construct(Mage::getConfig()->getNode('global/sales/order')); diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php index c663007fa62..70417ce81e1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api/V2.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,7 +27,6 @@ */ class Mage_Sales_Model_Order_Creditmemo_Api_V2 extends Mage_Sales_Model_Order_Creditmemo_Api { - /** * Prepare filters * diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php index 529b501cd12..62e14ea540c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php @@ -34,9 +34,6 @@ class Mage_Sales_Model_Order_Creditmemo_Config extends Mage_Sales_Model_Order_To */ protected $_collectorsCacheKey = 'sorted_order_creditmemo_collectors'; - /** - * Constructor - */ public function __construct() { parent::__construct(Mage::getConfig()->getNode('global/sales/order_creditmemo')); diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php index 6c70f7c9635..a9e52d44861 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.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 creditmemo shipping total calculation model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Order_Creditmemo_Total_Shipping extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php index c311ee85235..d8bfe19b8e0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Subtotal.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_Subtotal extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php index bfa4bc3e3ba..cee2f9b54c1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Tax.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_Order_Creditmemo_Total_Tax + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Order_Creditmemo_Total_Tax extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php index e20c0774cc8..f890dd6ba6d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api/V2.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/Invoice/Config.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php index e71cf102e8d..7127fa5b430 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php @@ -34,9 +34,6 @@ class Mage_Sales_Model_Order_Invoice_Config extends Mage_Sales_Model_Order_Total */ protected $_collectorsCacheKey = 'sorted_order_invoice_collectors'; - /** - * Constructor - */ public function __construct() { parent::__construct(Mage::getConfig()->getNode('global/sales/order_invoice')); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php index 161b1febc82..b23b3a8986b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.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_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Order_Invoice_Total_Shipping extends Mage_Sales_Model_Order_Invoice_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php index b75176af519..28cfaabc243 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Subtotal.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_Subtotal extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php index 626bb129c62..720651d0793 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Tax.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_Order_Invoice_Total_Tax + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Order_Invoice_Total_Tax extends Mage_Sales_Model_Order_Invoice_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index 1b5ff91ef17..f03c74a77cb 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -245,15 +245,11 @@ class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info protected $_transactionsLookup = []; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_payment'; /** - * Event object - * * @var string */ protected $_eventObject = 'payment'; diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php index 10cf509ebf0..3cd31d56825 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.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,9 @@ * Tracks transaction history, allows to build transactions hierarchy * By default transactions are saved as closed. * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team * * @method Mage_Sales_Model_Resource_Order_Payment_Transaction _getResource() * @method Mage_Sales_Model_Resource_Order_Payment_Transaction getResource() @@ -117,31 +117,22 @@ class Mage_Sales_Model_Order_Payment_Transaction extends Mage_Core_Model_Abstrac protected $_hasChild = null; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventPrefix * @var string */ protected $_eventPrefix = 'sales_order_payment_transaction'; /** - * Event object prefix - * * @see Mage_Core_Model_Absctract::$_eventObject * @var string */ protected $_eventObject = 'order_payment_transaction'; /** - * Order website id - * * @var int */ protected $_orderWebsiteId = null; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_payment_transaction'); diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php index 9b3df96c447..5aaa117a1b9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.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/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php index f37961a05b5..6fbc33942cd 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.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) */ /** * Sales order shipment model * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Shipment _getResource() * @method Mage_Sales_Model_Resource_Order_Shipment getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Collection getCollection() @@ -52,10 +56,6 @@ * @method $this setTotalWeight(float $value) * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Shipment extends Mage_Sales_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php index 1ba8f36f1fb..c10d15a0336 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api/V2.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/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php index ec840622a64..90438236927 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.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) */ /** * Class Mage_Sales_Model_Order_Shipment_Track * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Shipment_Track _getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Track getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Track_Collection getCollection() @@ -45,10 +49,6 @@ * @method $this setUpdatedAt(string $value) * @method float getWeight() * @method $this setWeight(float $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Shipment_Track extends Mage_Sales_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Status.php b/app/code/core/Mage/Sales/Model/Order/Status.php index 5df209707e7..a61af8a72d9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Order/Status.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) */ /** * Class Mage_Sales_Model_Order_Status + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Status _getResource() * @method Mage_Sales_Model_Resource_Order_Status getResource() * @method Mage_Sales_Model_Resource_Order_Status_Collection getCollection() diff --git a/app/code/core/Mage/Sales/Model/Order/Tax.php b/app/code/core/Mage/Sales/Model/Order/Tax.php index 9406d615d0a..86ec28b193f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Tax.php @@ -12,13 +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 * * @method Mage_Sales_Model_Resource_Order_Tax _getResource() * @method Mage_Sales_Model_Resource_Order_Tax getResource() @@ -44,10 +47,6 @@ * @method Mage_Sales_Model_Order_Tax setBaseRealAmount(float $value) * @method int getHidden() * @method Mage_Sales_Model_Order_Tax setHidden(int $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Tax extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Order/Total.php b/app/code/core/Mage/Sales/Model/Order/Total.php index 92e354b2be1..642b85b124e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total.php +++ b/app/code/core/Mage/Sales/Model/Order/Total.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_Total extends Varien_Object { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php index 91475cef2af..6f3010ebb26 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total.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) */ /** * Class Mage_Sales_Model_Quote_Address_Total * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Quote_Address getAddress() * @method $this setAddress(Mage_Sales_Model_Quote_Address $value) * @method string getCode() diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php index 476f6e7e72a..4b113f25441 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Custbalance.php @@ -19,9 +19,9 @@ */ /** - * @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_Custbalance extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php index f173594049e..42327c4dc58 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Trial.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 trial payment + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Recurring_Trial extends Mage_Sales_Model_Quote_Address_Total_Nominal_RecurringAbstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php index e457683fcc1..6afc55ec8d6 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.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) */ /** * Nominal shipping total + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Shipping extends Mage_Sales_Model_Quote_Address_Total_Shipping { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php index 78bfa07b789..3f8b6b8515d 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.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) */ /** * Nominal subtotal total + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal_Subtotal extends Mage_Sales_Model_Quote_Address_Total_Subtotal { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php index 29c7d181f2c..87ca15b0ed1 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.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_Quote_Address_Total_Shipping extends Mage_Sales_Model_Quote_Address_Total_Abstract { public function __construct() diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php index 9caad430c6c..57db140f3a5 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.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_Subtotal + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Subtotal extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php index 8e57589ca65..edaf794a259 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.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_Quote_Address_Total_Tax extends Mage_Sales_Model_Quote_Address_Total_Abstract { protected $_appliedTaxes = []; diff --git a/app/code/core/Mage/Sales/Model/Resource/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order.php index 6c9c1dd60f0..23677580ce7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_resource'; /** - * Event object - * * @var string */ protected $_eventObject = 'resource'; @@ -49,8 +45,6 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Ab protected $_grid = true; /** - * Use increment id - * * @var boolean */ protected $_useIncrementId = true; @@ -62,10 +56,6 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Ab */ protected $_entityCodeForIncrementId = 'order'; - /** - * Model Initialization - * - */ protected function _construct() { $this->_init('sales/order', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php index 31d4c5f422a..fa620f4aa2f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php @@ -70,15 +70,11 @@ abstract class Mage_Sales_Model_Resource_Order_Abstract extends Mage_Sales_Model protected $_gridColumns = null; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_resource'; /** - * Event object - * * @var string */ protected $_eventObject = 'resource'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php index 07cfc0c43a3..37624aae10a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php @@ -28,8 +28,6 @@ class Mage_Sales_Model_Resource_Order_Address extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_address_resource'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php index f6357543a22..a76bbb5d8a4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Address_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_address_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_address_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_address'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php index 30b1106f238..a4448afdc87 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.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 shipping address backend * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php index cc10edfbf07..a79adbf5af4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php index b56a999b19c..9af5e754e94 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php @@ -28,8 +28,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_resource'; @@ -55,10 +53,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo extends Mage_Sales_Model_Resour */ protected $_entityTypeForIncrementId = 'creditmemo'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/creditmemo', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php index 3395e866ca8..2f1b4e09533 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_collection'; @@ -48,10 +44,6 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Collection extends Mage_Sales_M */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_creditmemo'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php index e66dcd8451b..0e2f6aacdda 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Comment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/creditmemo_comment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php index 05c7a970215..51b090d96f7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Comment/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Comment_Collection extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_comment_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php index c61229879b6..21d622a6fee 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Grid/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection extends Mage_Sales_Model_Resource_Order_Creditmemo_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_grid_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php index 112e1795f5f..2e8a9ffe092 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_item_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_creditmemo_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php index 2e9c7f9db95..02fc27a71fb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Grid/Collection.php @@ -28,30 +28,20 @@ class Mage_Sales_Model_Resource_Order_Grid_Collection extends Mage_Sales_Model_Resource_Order_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_grid_collection'; /** - * Customer mode flag - * * @var bool */ protected $_customerModeFlag = false; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php index 8e86cb61326..634984c1379 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php @@ -28,8 +28,6 @@ class Mage_Sales_Model_Resource_Order_Invoice extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_resource'; @@ -55,10 +53,6 @@ class Mage_Sales_Model_Resource_Order_Invoice extends Mage_Sales_Model_Resource_ */ protected $_entityTypeForIncrementId = 'invoice'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/invoice', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php index e335250e319..b03ca09d105 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order_Invoice_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_collection'; @@ -48,10 +44,6 @@ class Mage_Sales_Model_Resource_Order_Invoice_Collection extends Mage_Sales_Mode */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_invoice'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php index 1523c926024..74496409a88 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Invoice_Comment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/invoice_comment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php index 846f1e3ec37..732bf55b6ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Comment/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_comment_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php index 7a3502f0e68..9af2bd678cc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Grid/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection extends Mage_Sales_Model_Resource_Order_Invoice_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_grid_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php index 0379c06ab30..751ae733213 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Invoice_Item extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/invoice_item', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php index c6fd5eff55b..a461e9aa14e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Item/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Invoice_Item_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_item_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_invoice_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php index c9965a09139..8146a601b78 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Item extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_item', 'item_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php index b31b6079f26..2fb7bcc6b88 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Order_Item_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_item_collection'; @@ -48,10 +44,6 @@ class Mage_Sales_Model_Resource_Order_Item_Collection extends Mage_Sales_Model_R */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php index 27b8d44cc2f..3a779207931 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php @@ -37,16 +37,10 @@ class Mage_Sales_Model_Resource_Order_Payment extends Mage_Sales_Model_Resource_ ]; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_payment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_payment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php index 950d502b2ca..c4f3a5aa786 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Payment_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_payment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_payment_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_payment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php index 09000845bcf..9e8bf453dc3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.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 transaction 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_Order_Payment_Transaction extends Mage_Sales_Model_Resource_Order_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php index d491b579637..4a3bd361f35 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php @@ -12,24 +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_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 shipment 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_Shipment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_resource'; @@ -42,23 +40,15 @@ class Mage_Sales_Model_Resource_Order_Shipment extends Mage_Sales_Model_Resource protected $_grid = true; /** - * Use increment id - * * @var bool */ protected $_useIncrementId = true; /** - * Entity type for increment id - * * @var string */ protected $_entityTypeForIncrementId = 'shipment'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php index 2215f3a3b05..8ef048d3e3e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Collection.php @@ -31,15 +31,11 @@ class Mage_Sales_Model_Resource_Order_Shipment_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_collection'; @@ -51,10 +47,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Collection extends Mage_Sales_Mod */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php index 538d11ab65a..e46d45d7bcd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Shipment_Comment extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment_comment', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php index 51969fb4e1c..9c3471c6275 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Comment/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Shipment_Comment_Collection extends Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_comment_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment_comment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php index d55a85cdf47..38526a4ebbc 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Grid/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection extends Mage_Sales_Model_Resource_Order_Shipment_Collection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_grid_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_grid_collection'; - /** - * Model initialization - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php index 551afc76f89..94982e46dfe 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item.php @@ -28,16 +28,10 @@ class Mage_Sales_Model_Resource_Order_Shipment_Item extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment_item', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php index 68b9d42d3a2..fad42cfcc65 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Item/Collection.php @@ -31,23 +31,15 @@ class Mage_Sales_Model_Resource_Order_Shipment_Item_Collection extends Mage_Sales_Model_Resource_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_item_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php index 053f5e31c39..d9d43f74f49 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track.php @@ -12,32 +12,26 @@ * obtain it through 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 shipment comment 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_Shipment_Track extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/shipment_track', 'entity_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php index 5d8ec0c4e38..f435bc097b3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Track/Collection.php @@ -31,15 +31,11 @@ class Mage_Sales_Model_Resource_Order_Shipment_Track_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_track_collection'; @@ -51,10 +47,6 @@ class Mage_Sales_Model_Resource_Order_Shipment_Track_Collection extends Mage_Sal */ protected $_orderField = 'order_id'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_shipment_track'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php index 0a37f8026f0..2c934d8218e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status.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 status 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_Order_Status extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php index fd379f6bf67..a6e99c366bf 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History/Collection.php @@ -28,23 +28,15 @@ class Mage_Sales_Model_Resource_Order_Status_History_Collection extends Mage_Sales_Model_Resource_Order_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_status_history_collection'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_status_history'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php index 4dceee9547d..5c30ad69244 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.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_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 Tax Model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Tax extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_tax', 'tax_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php index a39dad63945..b16de61e0b3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Order_Tax_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_tax', 'sales/order_tax'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php index efee14e175c..b98ce11aa06 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.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 shipping 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_Shipping extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php index 78717dee0ae..9e4b563b5ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.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 subtotal 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_Subtotal extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php index 769d3bacc40..24a7fb38185 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.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 tax 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_Tax extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php index 0f4cd93e293..3f65e33a2b8 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Quote_Address_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_quote_address_collection'; /** - * Event object name - * * @var string */ protected $_eventObject = 'quote_address_collection'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php index bef4b5690a6..8c331f0954a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile/Collection.php @@ -28,15 +28,11 @@ class Mage_Sales_Model_Resource_Recurring_Profile_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_recurring_profile_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'recurring_profile_collection'; diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php index cce76e57ef6..9f5a69f1560 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Report_Invoiced extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_setResource('sales'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php index d28dc3e567c..5f88cc7bb64 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Report_Order extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_aggregated_created', 'id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php index 5f6709bc97c..fda88826f7f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php @@ -27,10 +27,6 @@ */ class Mage_Sales_Model_Resource_Report_Order_Createdat extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_aggregated_created', 'id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php index ce83bd7f25b..e9c8edb17b7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat.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_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 entity resource model with aggregation by updated at * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Report_Order_Updatedat extends Mage_Sales_Model_Resource_Report_Order_Createdat { - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/order_aggregated_updated', 'id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php index aaaa2212827..0ec9f14356b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.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_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) */ /** * Shipping report 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_Report_Shipping extends Mage_Sales_Model_Resource_Report_Abstract { - /** - * Model initialization - * - */ protected function _construct() { $this->_setResource('sales'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php index fae74663be0..a46f935e938 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.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_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 report shipping collection * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Report_Shipping_Collection_Shipment extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Order { - /** - * Initialize custom resource model - * - */ public function __construct() { $this->setModel('adminhtml/report_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Setup.php b/app/code/core/Mage/Sales/Model/Resource/Setup.php index 8a0d3adc44c..2f400f48013 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sales/Model/Resource/Setup.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) */ /** * Setup Model of Sales Module * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Setup extends Mage_Eav_Model_Entity_Setup { diff --git a/app/code/core/Mage/Sales/etc/adminhtml.xml b/app/code/core/Mage/Sales/etc/adminhtml.xml index 4d2f1a31e36..d000c2d6fc5 100644 --- a/app/code/core/Mage/Sales/etc/adminhtml.xml +++ b/app/code/core/Mage/Sales/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/api.xml b/app/code/core/Mage/Sales/etc/api.xml index 9f35786e65f..bcc5f9a47b0 100644 --- a/app/code/core/Mage/Sales/etc/api.xml +++ b/app/code/core/Mage/Sales/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/api2.xml b/app/code/core/Mage/Sales/etc/api2.xml index 06ceaabdc40..580cd414d27 100644 --- a/app/code/core/Mage/Sales/etc/api2.xml +++ b/app/code/core/Mage/Sales/etc/api2.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml index 13b2c1fc641..db0c84fdbe4 100644 --- a/app/code/core/Mage/Sales/etc/config.xml +++ b/app/code/core/Mage/Sales/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sales * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml index 6180f62b0e5..c98aa329f4b 100644 --- a/app/code/core/Mage/Sales/etc/system.xml +++ b/app/code/core/Mage/Sales/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/etc/widget.xml b/app/code/core/Mage/Sales/etc/widget.xml index 9f977002269..cfe91e9ed4b 100644 --- a/app/code/core/Mage/Sales/etc/widget.xml +++ b/app/code/core/Mage/Sales/etc/widget.xml @@ -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_Sales - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php index 17da1c91d0e..f06cc7ea6fd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/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_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/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php index 6cd76123e12..0823196ca25 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.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_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 */ $installer = $this; $installer->startSetup(); + $installer->getConnection() ->addColumn($installer->getTable('sales/shipment'), 'packages', [ 'type' => Varien_Db_Ddl_Table::TYPE_TEXT, diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php index 847c77f593d..eb7e61e04b2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php @@ -12,14 +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_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 */ $installer = $this; + $installer->getConnection() ->addColumn($installer->getTable('sales/shipment'), 'shipping_label', [ 'type' => Varien_Db_Ddl_Table::TYPE_VARBINARY, diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php index e68fee55c77..92ef815c009 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php @@ -12,18 +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_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) - */ - -/** - * Create aggregation tables for updated_at fields + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $connection->createTable($connection->createTableByDdl( $installer->getTable('sales/order_aggregated_created'), diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php index 0c882a70145..590e0482472 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php @@ -12,14 +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_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 */ $installer = $this; + $installer->getConnection() ->addColumn($installer->getTable('sales/order_item'), 'base_tax_refunded', [ 'type' => Varien_Db_Ddl_Table::TYPE_DECIMAL, diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php index 3937a7c49c7..6fbcd3aa377 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/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_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/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php index e17bcb6c030..07b059475ab 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.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/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php index 6eed9d27e26..415b5c6760a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.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/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php index c19421176e2..60acc51e3a7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.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_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 */ $installer = $this; - $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.php index 68a81f720df..d81d4569c4f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.9-1.6.0.10.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_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 */ $installer = $this; - $installer->startSetup(); $bestsellersTables = [$installer->getTable('sales/bestsellers_aggregated_daily'), diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index c594dcbcb3a..8c4b8e67d5f 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @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/Mysql4/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php index 2169facb168..6b52255cc74 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.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) */ /** * SalesRule Mysql4 Coupon Usage Resource Model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team * @deprecated */ class Mage_SalesRule_Model_Mysql4_Coupon_Usage extends Mage_SalesRule_Model_Resource_Coupon_Usage diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php index b8cff3c1a50..c2f4f7fac87 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php @@ -27,9 +27,6 @@ */ class Mage_SalesRule_Model_Resource_Coupon extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor adds unique fields - */ protected function _construct() { $this->_init('salesrule/coupon', 'coupon_id'); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php index ada37df55b8..3f1aaa596f1 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php @@ -27,10 +27,6 @@ */ class Mage_SalesRule_Model_Resource_Coupon_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php index b2c948c0862..8af54d87324 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.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_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 Model Resource Coupon_Usage * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Resource_Coupon_Usage extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor - * - */ protected function _construct() { $this->_init('salesrule/coupon_usage', ''); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php index 0bff8bcffe2..4ec16acd10d 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Updatedat.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_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) */ /** * Rule report resource model with aggregation by updated at * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Resource_Report_Rule_Updatedat extends Mage_SalesRule_Model_Resource_Report_Rule_Createdat { - /** - * Resource Report Rule constructor - * - */ protected function _construct() { $this->_init('salesrule/coupon_aggregated_updated', 'id'); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php index c8bcf2fd653..baa72719368 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php @@ -27,10 +27,6 @@ */ class Mage_SalesRule_Model_Resource_Rule_Customer extends Mage_Core_Model_Resource_Db_Abstract { - /** - * constructor - * - */ protected function _construct() { $this->_init('salesrule/rule_customer', 'rule_customer_id'); diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php index 1282765ecd6..d714ad70ebd 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.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_Subselect * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + * * @method $this setAttributeOption(array $value) * @method $this setOperatorOption(array $value) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php index b2a5518fda4..22db732876e 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php @@ -21,9 +21,9 @@ /** * SalesRule Rule Customer Model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team * * @method Mage_SalesRule_Model_Resource_Rule_Customer _getResource() * @method Mage_SalesRule_Model_Resource_Rule_Customer getResource() diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index eeb853ea4ff..d7441bc33e9 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.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_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) */ /** diff --git a/app/code/core/Mage/SalesRule/etc/adminhtml.xml b/app/code/core/Mage/SalesRule/etc/adminhtml.xml index 839ac58bb87..12705b1a6bc 100644 --- a/app/code/core/Mage/SalesRule/etc/adminhtml.xml +++ b/app/code/core/Mage/SalesRule/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index ac1229203a8..560936ee446 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_SalesRule * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/etc/system.xml b/app/code/core/Mage/SalesRule/etc/system.xml index c776b48c509..d285b6bc23a 100644 --- a/app/code/core/Mage/SalesRule/etc/system.xml +++ b/app/code/core/Mage/SalesRule/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php index cb8bf99d5f2..e86f9c6dd80 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.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_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) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $connection->createTable($connection->createTableByDdl( $installer->getTable('salesrule/coupon_aggregated'), diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php index b037a685870..893ea8e6bd7 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.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_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) */ -/** - * @var Mage_Core_Model_Resource_Setup $installer - */ +/** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; $installer->getConnection() diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php index f283ca9254c..2448d8a5793 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/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_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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index c6944615d95..aca077e3766 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -22,7 +22,7 @@ * Sendfriend Data Helper * * @category Mage - * @package Mage_Sedfriend + * @package Mage_Sendfriend * @author Magento Core Team */ class Mage_Sendfriend_Helper_Data extends Mage_Core_Helper_Abstract diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php index 05361fc8d0c..9d42c096749 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.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 module Setup Model * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team * @deprecated */ class Mage_Sendfriend_Model_Mysql4_Setup extends Mage_Sendfriend_Model_Resource_Setup diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php index f1f995ffa09..f540cda16b3 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php @@ -27,10 +27,6 @@ */ class Mage_Sendfriend_Model_Resource_Sendfriend extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and table - * - */ protected function _construct() { $this->_init('sendfriend/sendfriend', 'log_id'); diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php index 1807661e3e6..d048d7222e8 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.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 module Setup Model * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team */ class Mage_Sendfriend_Model_Resource_Setup extends Mage_Core_Model_Resource_Setup { diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml index cbc9afb21e0..51a5749d49c 100644 --- a/app/code/core/Mage/Sendfriend/etc/config.xml +++ b/app/code/core/Mage/Sendfriend/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sendfriend * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sendfriend/etc/system.xml b/app/code/core/Mage/Sendfriend/etc/system.xml index 8b80116c275..c3999b4018f 100644 --- a/app/code/core/Mage/Sendfriend/etc/system.xml +++ b/app/code/core/Mage/Sendfriend/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php index db67c44df6f..b273e4c18c4 100644 --- a/app/code/core/Mage/Shipping/Helper/Data.php +++ b/app/code/core/Mage/Shipping/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team + * @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/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index 7d65ec64cd2..a479e976d87 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -12,18 +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_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_Carrier_Tablerate + * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface { - /** * code name * @@ -52,9 +55,6 @@ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_ */ protected $_conditionNames = []; - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php index 4e082687b2c..e2160aa8850 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.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_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 table rates * - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team * @deprecated */ class Mage_Shipping_Model_Mysql4_Carrier_Tablerate extends Mage_Shipping_Model_Resource_Carrier_Tablerate diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php index fa8b672c05b..4e6d1c57737 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.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) */ /** @@ -91,9 +91,6 @@ class Mage_Shipping_Model_Resource_Carrier_Tablerate extends Mage_Core_Model_Res */ protected $_conditionFullNames = []; - /** - * Define main table and id field name - */ protected function _construct() { $this->_init('shipping/tablerate', 'pk'); diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php index a63b9b53a2c..07a0c78765b 100644 --- a/app/code/core/Mage/Shipping/Model/Shipping.php +++ b/app/code/core/Mage/Shipping/Model/Shipping.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_Shipping { /** diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php index e3f3c661b32..1b1d4e0b81d 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.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) */ /** @@ -38,6 +38,10 @@ * Fields: * -carrier: usps * -tracksummary: Your item was delivered at 6:50 am on February 6 in Los Angeles CA 90064 + * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team */ class Mage_Shipping_Model_Tracking_Result_Status extends Mage_Shipping_Model_Tracking_Result_Abstract { diff --git a/app/code/core/Mage/Shipping/controllers/ShippingController.php b/app/code/core/Mage/Shipping/controllers/ShippingController.php index 51f00a5b1c1..a3c6bec9d34 100644 --- a/app/code/core/Mage/Shipping/controllers/ShippingController.php +++ b/app/code/core/Mage/Shipping/controllers/ShippingController.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 * @deprecated after 1.3.2.3 - this controller is not used anywhere */ class Mage_Shipping_ShippingController extends Mage_Core_Controller_Front_Action diff --git a/app/code/core/Mage/Shipping/controllers/TrackingController.php b/app/code/core/Mage/Shipping/controllers/TrackingController.php index fe2abf00d31..f9136dd5791 100644 --- a/app/code/core/Mage/Shipping/controllers/TrackingController.php +++ b/app/code/core/Mage/Shipping/controllers/TrackingController.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,15 +23,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Shipping_TrackingController extends Mage_Core_Controller_Front_Action { - /** - * Ajax action - * - */ public function ajaxAction() { if ($order = $this->_initOrder()) { diff --git a/app/code/core/Mage/Shipping/etc/adminhtml.xml b/app/code/core/Mage/Shipping/etc/adminhtml.xml index 21876f25ea9..c2e608ad2c3 100644 --- a/app/code/core/Mage/Shipping/etc/adminhtml.xml +++ b/app/code/core/Mage/Shipping/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/config.xml b/app/code/core/Mage/Shipping/etc/config.xml index 962b98642a6..2b24356c74e 100644 --- a/app/code/core/Mage/Shipping/etc/config.xml +++ b/app/code/core/Mage/Shipping/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Shipping * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml index 87688afdde9..f8652afcab8 100644 --- a/app/code/core/Mage/Shipping/etc/system.xml +++ b/app/code/core/Mage/Shipping/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/Helper/Data.php b/app/code/core/Mage/Sitemap/Helper/Data.php index 5e56bd7f2ec..09fb93d556a 100644 --- a/app/code/core/Mage/Sitemap/Helper/Data.php +++ b/app/code/core/Mage/Sitemap/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @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/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php index 55359638e43..f32d31efcd2 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.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_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 resource model * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team * @deprecated */ class Mage_Sitemap_Model_Mysql4_Sitemap extends Mage_Sitemap_Model_Resource_Sitemap diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php index 6cc5299b00b..39dae57d0b5 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.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_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 resource model * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team */ class Mage_Sitemap_Model_Resource_Sitemap extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Init resource model - * - */ protected function _construct() { $this->_init('sitemap/sitemap', 'sitemap_id'); diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php index ecb04f7eca6..1f58b44d9b5 100644 --- a/app/code/core/Mage/Sitemap/Model/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Sitemap.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_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 model * + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team + * * @method Mage_Sitemap_Model_Resource_Sitemap _getResource() * @method Mage_Sitemap_Model_Resource_Sitemap getResource() * @method Mage_Sitemap_Model_Resource_Sitemap_Collection getCollection() @@ -36,10 +40,6 @@ * @method $this setSitemapTime(string $value) * @method int getStoreId() * @method $this setStoreId(int $value) - * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team */ class Mage_Sitemap_Model_Sitemap extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Sitemap/etc/adminhtml.xml b/app/code/core/Mage/Sitemap/etc/adminhtml.xml index 034801d78ca..6cb7d21dc9b 100644 --- a/app/code/core/Mage/Sitemap/etc/adminhtml.xml +++ b/app/code/core/Mage/Sitemap/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/etc/config.xml b/app/code/core/Mage/Sitemap/etc/config.xml index 7be272a93ef..7099c0cb02f 100644 --- a/app/code/core/Mage/Sitemap/etc/config.xml +++ b/app/code/core/Mage/Sitemap/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Sitemap * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/etc/system.xml b/app/code/core/Mage/Sitemap/etc/system.xml index 3539e3d4df6..a95003c1fb5 100644 --- a/app/code/core/Mage/Sitemap/etc/system.xml +++ b/app/code/core/Mage/Sitemap/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php index ee3e4e77ade..92f984b468b 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Tags.php +++ b/app/code/core/Mage/Tag/Block/Customer/Tags.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_Block_Customer_Tags extends Mage_Customer_Block_Account_Dashboard { protected $_tags; diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php index 3c7c62e6ac2..4b7ac8d8395 100644 --- a/app/code/core/Mage/Tag/Block/Customer/View.php +++ b/app/code/core/Mage/Tag/Block/Customer/View.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) */ /** diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index 38e269cf85c..597af40072b 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @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/Model/Api/V2.php b/app/code/core/Mage/Tag/Model/Api/V2.php index 91f48f061e6..83f78b79fd4 100644 --- a/app/code/core/Mage/Tag/Model/Api/V2.php +++ b/app/code/core/Mage/Tag/Model/Api/V2.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) */ /** diff --git a/app/code/core/Mage/Tag/Model/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Indexer/Summary.php index c281e3a08cb..648e9b3683a 100644 --- a/app/code/core/Mage/Tag/Model/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Indexer/Summary.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_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 Indexer Model * + * @category Mage + * @package Mage_Tag + * @author Magento Core Team + * * @method Mage_Tag_Model_Resource_Indexer_Summary _getResource() * @method Mage_Tag_Model_Resource_Indexer_Summary getResource() * @method int getTagId() @@ -39,10 +43,6 @@ * @method Mage_Tag_Model_Indexer_Summary setPopularity(int $value) * @method int getBasePopularity() * @method Mage_Tag_Model_Indexer_Summary setBasePopularity(int $value) - * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team */ class Mage_Tag_Model_Indexer_Summary extends Mage_Index_Model_Indexer_Abstract { @@ -63,10 +63,6 @@ class Mage_Tag_Model_Indexer_Summary extends Mage_Index_Model_Indexer_Abstract ] ]; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('tag/indexer_summary'); diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php index 9d979ecba23..58f231d151d 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.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_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 Indexer Model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team * @deprecated */ class Mage_Tag_Model_Mysql4_Indexer_Summary extends Mage_Tag_Model_Resource_Indexer_Summary diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php index 226a0c9b9d1..767fa312178 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag.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_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 resource model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team * @deprecated */ class Mage_Tag_Model_Mysql4_Tag extends Mage_Tag_Model_Resource_Tag diff --git a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php index 69b945759d3..55a85878a10 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.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_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 Indexer Model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team */ class Mage_Tag_Model_Resource_Indexer_Summary extends Mage_Catalog_Model_Resource_Product_Indexer_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('tag/summary', 'tag_id'); diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php index 3d57eded6d7..7c8a9cfd852 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag.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_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 resource model * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team */ class Mage_Tag_Model_Resource_Tag extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and primary index - * - */ protected function _construct() { $this->_init('tag/tag', 'tag_id'); diff --git a/app/code/core/Mage/Tag/Model/Session.php b/app/code/core/Mage/Tag/Model/Session.php index 107c059766f..29e8fd6f83b 100644 --- a/app/code/core/Mage/Tag/Model/Session.php +++ b/app/code/core/Mage/Tag/Model/Session.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,7 +23,7 @@ * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Tag_Model_Session extends Mage_Core_Model_Session_Abstract { diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php index 6e0740c9073..731bf85af8a 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.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_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 model * + * @category Mage + * @package Mage_Tag + * @author Magento Core Team + * * @method Mage_Tag_Model_Resource_Tag _getResource() * @method Mage_Tag_Model_Resource_Tag getResource() * @method Mage_Tag_Model_Resource_Tag_Collection getCollection() @@ -44,12 +48,7 @@ * @method $this setStoreId(int $value) * @method array getVisibleInStoreIds() * @method $this setVisibleInStoreIds(array $value) - * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team */ - class Mage_Tag_Model_Tag extends Mage_Core_Model_Abstract { const STATUS_DISABLED = -1; diff --git a/app/code/core/Mage/Tag/etc/adminhtml.xml b/app/code/core/Mage/Tag/etc/adminhtml.xml index be1ee8522c0..de301b9c4be 100644 --- a/app/code/core/Mage/Tag/etc/adminhtml.xml +++ b/app/code/core/Mage/Tag/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/etc/api.xml b/app/code/core/Mage/Tag/etc/api.xml index 0d5fc9286d4..286dadd0a6f 100644 --- a/app/code/core/Mage/Tag/etc/api.xml +++ b/app/code/core/Mage/Tag/etc/api.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml index c2e96b4d1bc..256d0e54d0a 100644 --- a/app/code/core/Mage/Tag/etc/config.xml +++ b/app/code/core/Mage/Tag/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tag * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php index e7f5aa48684..ba5365a365a 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.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_Block_Adminhtml_Frontend_Region_Updater extends Mage_Adminhtml_Block_System_Config_Form_Field { /** diff --git a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php b/app/code/core/Mage/Tax/Block/Checkout/Shipping.php index 994ad6ba6b1..32dbdd9ab53 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Shipping.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_Shipping extends Mage_Checkout_Block_Total_Default { protected $_template = 'tax/checkout/shipping.phtml'; diff --git a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php index b01b2b27eb9..37af6ae9847 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.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_Subtotal extends Mage_Checkout_Block_Total_Default { /** diff --git a/app/code/core/Mage/Tax/Block/Checkout/Tax.php b/app/code/core/Mage/Tax/Block/Checkout/Tax.php index 15cf1357b29..f0cdc54af11 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Tax.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Tax.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_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) */ /** diff --git a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php index 3eb62c64f04..8213a490b05 100644 --- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.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_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) */ /** diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php index 35ad0d95b8f..0a5ac4010a0 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @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/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php index 338379be014..2fed85c7f21 100644 --- a/app/code/core/Mage/Tax/Model/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Calculation.php @@ -126,9 +126,6 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract */ protected $_taxHelper; - /** - * Constructor - */ protected function _construct() { $this->_init('tax/calculation'); diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php index 02211a45ec5..84f4c1ecb3e 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.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_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 Rate Title Model * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team + * * @method Mage_Tax_Model_Resource_Calculation_Rate_Title _getResource() * @method Mage_Tax_Model_Resource_Calculation_Rate_Title getResource() * @method Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection getCollection() @@ -31,10 +35,6 @@ * @method $this setStoreId(int $value) * @method string getValue() * @method $this setValue(string $value) - * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team */ class Mage_Tax_Model_Calculation_Rate_Title extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php index 86afd420b23..449ed3513e0 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php @@ -21,9 +21,9 @@ /** * Class Mage_Tax_Model_Class_Source_Customer * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Class_Source_Customer extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php index 96e49b049ae..d09fa5f15b9 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title.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_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 Rate Title Collection * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Calculation_Rate_Title extends Mage_Tax_Model_Resource_Calculation_Rate_Title diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php index e09e799abc4..848d437ed18 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.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_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 + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Report_Tax extends Mage_Tax_Model_Resource_Report_Tax diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php index 507fd46f96d..2167a100ea7 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax.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_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 + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Sales_Order_Tax extends Mage_Tax_Model_Resource_Sales_Order_Tax diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php index 018219f8828..e4c0a4ac722 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Setup.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_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 Setup Resource Model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team * @deprecated */ class Mage_Tax_Model_Mysql4_Setup extends Mage_Tax_Model_Resource_Setup diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php index 53076c96087..90b68e8f3e3 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title.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_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 Rate Title Collection * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Calculation_Rate_Title extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_calculation_rate_title', 'tax_calculation_rate_title_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php index b4e29e2e256..b30b23fdb5c 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.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_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 report resource model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Report_Tax extends Mage_Reports_Model_Resource_Report_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_order_aggregated_created', 'id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php index edbb5052eb2..49754c2d8cb 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Updatedat.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_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 report resource model with aggregation by updated at * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Report_Tax_Updatedat extends Mage_Tax_Model_Resource_Report_Tax_Createdat { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_order_aggregated_updated', 'id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php index cc81c4c6b09..8c975ffc0df 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax.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_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) */ /** * Sales order tax resource model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Sales_Order_Tax extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/sales_order_tax', 'tax_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Setup.php b/app/code/core/Mage/Tax/Model/Resource/Setup.php index 8a1473881b5..dc7e3c6d355 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Setup.php +++ b/app/code/core/Mage/Tax/Model/Resource/Setup.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_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 Setup Resource Model * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php index 8efcaaceb11..bfa3ed2db97 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.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 + * * @method Mage_Tax_Model_Resource_Sales_Order_Tax _getResource() * @method Mage_Tax_Model_Resource_Sales_Order_Tax getResource() * @method Mage_Tax_Model_Resource_Sales_Order_Tax_Collection getCollection() @@ -45,10 +49,6 @@ * @method $this setBaseRealAmount(float $value) * @method int getHidden() * @method $this setHidden(int $value) - * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team */ class Mage_Tax_Model_Sales_Order_Tax extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php index fdff9b39adb..0fbc5ee689f 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.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) */ /** - * Class Mage_Tax_Model_Sales_Pdf_Shipping + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Pdf_Shipping extends Mage_Sales_Model_Order_Pdf_Total_Default { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php index 4e8068ac715..1abad29143f 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.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) */ /** * Class Mage_Tax_Model_Sales_Pdf_Subtotal + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Pdf_Subtotal extends Mage_Sales_Model_Order_Pdf_Total_Default { diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php index 391eb84aca5..144f1f7c612 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.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_Tax extends Mage_Sales_Model_Order_Pdf_Total_Default { /** diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php index 18b4ba832aa..d16a05440a5 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Subtotal.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) */ /** * Nominal subtotal tax total + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Nominal_Subtotal extends Mage_Tax_Model_Sales_Total_Quote_Subtotal { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php index a067bdbad3b..a77dab6ff83 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.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) */ /** * Nominal tax total + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Nominal_Tax extends Mage_Tax_Model_Sales_Total_Quote_Tax { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php index fa5a9fe0604..44cffa248ba 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.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_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) */ /** * Model to calculate shipping tax * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Shipping extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php index 98ee2d094bd..df4c5e662ed 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Subtotal.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) */ /** * Calculate items and address amounts including/excluding tax + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Subtotal extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php index 55af2928a4b..b9bed02ed28 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.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 totals calculation model + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Sales_Total_Quote_Tax extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php index 0acf43db912..d46a664ff5b 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Display/Type.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_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) */ /** * Price display type source model * - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_System_Config_Source_Tax_Display_Type { diff --git a/app/code/core/Mage/Tax/etc/adminhtml.xml b/app/code/core/Mage/Tax/etc/adminhtml.xml index d2c45f24761..b084c5cbe09 100644 --- a/app/code/core/Mage/Tax/etc/adminhtml.xml +++ b/app/code/core/Mage/Tax/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml index 0c9b0a0d779..bcdef0d3858 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Tax * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/etc/system.xml b/app/code/core/Mage/Tax/etc/system.xml index dd318f38872..e867a5791cb 100644 --- a/app/code/core/Mage/Tax/etc/system.xml +++ b/app/code/core/Mage/Tax/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php index 7ffca868e6a..ab41d8ee4ef 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.0-1.6.0.1.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_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) */ -$installer = $this; /** @var Mage_Tax_Model_Resource_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $connection->createTable($connection->createTableByDdl( $installer->getTable('tax/tax_order_aggregated_created'), diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php index e261c43d54a..47fc36a93a3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.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_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 */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php index e240a7992d3..ea3621014c4 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.2-1.6.0.3.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_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) */ -$installer = $this; /** @var Mage_Tax_Model_Resource_Setup $installer */ +$installer = $this; /** * Add new field to 'tax/sales_order_tax_item' diff --git a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php index 8c350e10435..70861ccedcd 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/upgrade-1.6.0.3-1.6.0.4.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_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 $this */ diff --git a/app/code/core/Mage/Uploader/Block/Single.php b/app/code/core/Mage/Uploader/Block/Single.php index e5879c70cd9..36188d7075c 100644 --- a/app/code/core/Mage/Uploader/Block/Single.php +++ b/app/code/core/Mage/Uploader/Block/Single.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_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) */ +/** + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team + */ class Mage_Uploader_Block_Single extends Mage_Uploader_Block_Abstract { /** @@ -33,9 +38,6 @@ protected function _prepareLayout() return $this; } - /** - * Constructor for single uploader block - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Uploader/Helper/Data.php b/app/code/core/Mage/Uploader/Helper/Data.php index a045d4dfade..e3b964e31a1 100644 --- a/app/code/core/Mage/Uploader/Helper/Data.php +++ b/app/code/core/Mage/Uploader/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Uploader - * @author Magento Core Team + * @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/Model/Config/Uploader.php b/app/code/core/Mage/Uploader/Model/Config/Uploader.php index ecd0fa57a6b..54618e78f37 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Uploader.php +++ b/app/code/core/Mage/Uploader/Model/Config/Uploader.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_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 Config Instance Abstract Model * - * @category Mage - * @package Mage_Uploader - */ - -/** + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team + * * @method Mage_Uploader_Model_Config_Uploader setTarget(string $url) * The target URL for the multipart POST request. * @method Mage_Uploader_Model_Config_Uploader setSingleFile(bool $isSingleFile) @@ -73,8 +72,6 @@ * Response is success if response status is in this list * @method Mage_Uploader_Model_Config_Uploader setPermanentErrors(array $permanentErrors) * Response fails if response status is in this list - * - * Class Mage_Uploader_Model_Config_Uploader */ class Mage_Uploader_Model_Config_Uploader extends Mage_Uploader_Model_Config_Abstract { diff --git a/app/code/core/Mage/Uploader/etc/config.xml b/app/code/core/Mage/Uploader/etc/config.xml index e975be25bd5..7d7863bb805 100644 --- a/app/code/core/Mage/Uploader/etc/config.xml +++ b/app/code/core/Mage/Uploader/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Uploader/etc/jstranslator.xml b/app/code/core/Mage/Uploader/etc/jstranslator.xml index 3229725251e..4ff42895612 100644 --- a/app/code/core/Mage/Uploader/etc/jstranslator.xml +++ b/app/code/core/Mage/Uploader/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Uploader * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php index 6fa819a4c27..ab5b92cf614 100644 --- a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.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) */ /** @@ -27,10 +27,6 @@ */ class Mage_Usa_Block_Adminhtml_Dhl_Unitofmeasure extends Mage_Adminhtml_Block_System_Config_Form_Field { - - /** - * Define params and variables - */ public function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Usa/Helper/Data.php b/app/code/core/Mage/Usa/Helper/Data.php index 224d797f653..efcd138dba0 100644 --- a/app/code/core/Mage/Usa/Helper/Data.php +++ b/app/code/core/Mage/Usa/Helper/Data.php @@ -19,9 +19,9 @@ */ /** - * @category Mage - * @package Mage_Usa - * @author Magento Core Team + * @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/Dhl/International/Source/Method/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php index b54746333d0..486f6897710 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.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/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php index bcc7d7805bb..87def85c457 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Unitofmeasure.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/Protection/Value.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php index 50022e5ae41..a4868c71173 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Value.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_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) */ - class Mage_Usa_Model_Shipping_Carrier_Dhl_Source_Protection_Value { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php index 2b8bcb16cbb..c266df5b572 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Shipmenttype.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_Shipmenttype { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php index 571aef27e4b..e1c9d677c8c 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.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.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php index cadeec68e7e..367f369a76f 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.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_Ups 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/Ups/Backend/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php index 485f257b6ea..c41dc46be58 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.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_Type extends Mage_Usa_Model_Shipping_Carrier_Abstract_Backend_Abstract { /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php index 27df617a4c9..a3ed9ed0df6 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.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_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 Ups type action Dropdown source * - * @author Magento Core Team + * @category Mage + * @package Mage_Usa + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Type { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php index 6a757f87455..79b38ca24cf 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Unitofmeasure.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_Unitofmeasure { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php index 0dc07c3dc5c..7eac712a749 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.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) */ /** @@ -24,7 +24,7 @@ * @link http://www.usps.com/webtools/htm/Development-Guide-v3-0b.htm * @category Mage * @package Mage_Usa - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Usps extends Mage_Usa_Model_Shipping_Carrier_Abstract diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php index bc915d05389..887e7353d58 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Size.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_Size { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml index 8f0090ee5af..ad5e0fb8243 100644 --- a/app/code/core/Mage/Usa/etc/config.xml +++ b/app/code/core/Mage/Usa/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml b/app/code/core/Mage/Usa/etc/dhl/international/countries.xml index 794e3f842ca..04a3c4929c2 100644 --- a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml +++ b/app/code/core/Mage/Usa/etc/dhl/international/countries.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Usa * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 9982521b8b0..be0a53e64dc 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php index 94b5e2c92e6..ee326e623e1 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/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_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) */ $codes = [ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php index d43e6e68c21..085df3d48d1 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php @@ -12,14 +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) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; + $configDataTable = $installer->getTable('core/config_data'); $connection = $installer->getConnection(); diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php index 17b446b9d5d..72180307fd4 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/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_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) */ /** @var Mage_Core_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php index f57c4645b39..ca2a12c612b 100644 --- a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.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_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_Block_Element_Weee_Tax extends Varien_Data_Form_Element_Abstract { } diff --git a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php index f00e9541ef6..f5eb35c7570 100644 --- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.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_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) */ /** @@ -23,7 +23,7 @@ * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Weee_Block_Renderer_Weee_Tax extends Mage_Adminhtml_Block_Widget implements Varien_Data_Form_Element_Renderer_Interface { diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php index d2efdbc45da..ac8fd28e129 100644 --- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.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_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) */ - class Mage_Weee_Model_Attribute_Backend_Weee_Tax extends Mage_Catalog_Model_Product_Attribute_Backend_Price { /** @@ -27,6 +26,7 @@ public static function getBackendModelName() { return 'weee/attribute_backend_weee_tax'; } + /** * Retrieve resource model * diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php b/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php index 232d21ed63b..da2784a4196 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Fpt/Tax.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_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_Fpt_Tax { diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php index 223b0c4831c..9f578052864 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Attribute/Backend/Weee/Tax.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_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) */ /** * Catalog product WEEE tax backend attribute model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team * @deprecated */ class Mage_Weee_Model_Mysql4_Attribute_Backend_Weee_Tax extends Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php index 9c585cf6473..fe8660d152f 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Setup.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_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 tax setup * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team * @deprecated */ class Mage_Weee_Model_Mysql4_Setup extends Mage_Weee_Model_Resource_Setup diff --git a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php index 9bb1fb4d8d3..b8cca50946f 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Tax.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_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 + * @category Mage + * @package Mage_Weee + * @author Magento Core Team * @deprecated */ class Mage_Weee_Model_Mysql4_Tax extends Mage_Weee_Model_Resource_Tax diff --git a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php index 6f6b5e51499..5c1229e8d03 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Attribute/Backend/Weee/Tax.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_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) */ /** * Catalog product WEEE tax backend attribute model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Resource_Attribute_Backend_Weee_Tax extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Weee/Model/Resource/Setup.php b/app/code/core/Mage/Weee/Model/Resource/Setup.php index 9d1df65bae8..a50c9e5e022 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Setup.php +++ b/app/code/core/Mage/Weee/Model/Resource/Setup.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_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 tax setup * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Resource_Setup extends Mage_Sales_Model_Resource_Setup { diff --git a/app/code/core/Mage/Weee/Model/Resource/Tax.php b/app/code/core/Mage/Weee/Model/Resource/Tax.php index 5efc08cdc83..73fad4a9781 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Tax.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_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) */ /** * Wee tax resource model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Resource_Tax extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('weee/tax', 'value_id'); diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php index 0c4f6834d7e..623608a5a08 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.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_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) */ /** * Model to calculate Weee amount * + * @category Mage + * @package Mage_Weee + * @author Magento Core Team + * * @method Mage_Weee_Model_Resource_Tax _getResource() * @method Mage_Weee_Model_Resource_Tax getResource() */ diff --git a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php index 8a74fd94ee4..1adbbc2dbff 100644 --- a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.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_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_Total_Creditmemo_Weee extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract { /** diff --git a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php index cd561108c0a..eb9730546d1 100644 --- a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.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_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_Total_Invoice_Weee extends Mage_Sales_Model_Order_Invoice_Total_Abstract { /** diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php index 8a28b330f1e..30515b4fd97 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Nominal/Weee.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_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) */ /** * Nominal fixed product tax total + * + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Total_Quote_Nominal_Weee extends Mage_Weee_Model_Total_Quote_Weee { diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index 450e20c2e48..f7d2f807055 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.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_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 calculation model * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Total_Quote_Weee extends Mage_Tax_Model_Sales_Total_Quote_Tax { diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml index 2560f2f07e8..3292e7abf46 100644 --- a/app/code/core/Mage/Weee/etc/config.xml +++ b/app/code/core/Mage/Weee/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Weee * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Weee/etc/system.xml b/app/code/core/Mage/Weee/etc/system.xml index 1976fe0a184..e7e674fdaea 100644 --- a/app/code/core/Mage/Weee/etc/system.xml +++ b/app/code/core/Mage/Weee/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php index ba410949631..0aeb841065a 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.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) */ /** diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php index cc5bbb17089..9f2b540d847 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Template.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 template chooser * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * * @method string getSelected() * @method $this setSelected(string $value) diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php index 670014bf039..8d71b6bbb89 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.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 Settings tab 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_Edit_Tab_Settings extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface { diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php index 5f650fd23f2..fcc9cfa242d 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tabs.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 tabs 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_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php index ced995c930d..3d14b278bb7 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget.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) */ /** * Preconfigured widget * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * @deprecated */ class Mage_Widget_Model_Mysql4_Widget extends Mage_Widget_Model_Resource_Widget diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget.php b/app/code/core/Mage/Widget/Model/Resource/Widget.php index 14ffa3e170a..4aed5488b35 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget.php @@ -12,26 +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) */ /** * Preconfigured widget * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Model_Resource_Widget extends Mage_Core_Model_Resource_Db_Abstract { - - /** - * Define main table - * - */ protected function _construct() { $this->_init('widget/widget', 'widget_id'); diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php index ef7c09111ba..ab68b556cae 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php @@ -27,10 +27,6 @@ */ class Mage_Widget_Model_Resource_Widget_Instance extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('widget/widget_instance', 'instance_id'); diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php index 51eb918d211..0da235c1bc3 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php @@ -34,10 +34,6 @@ class Mage_Widget_Model_Resource_Widget_Instance_Collection extends Mage_Core_Mo */ protected $_map = ['fields' => ['type' => 'instance_type']]; - /** - * Constructor - * - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php index 9147290f6b1..cf69f000d64 100644 --- a/app/code/core/Mage/Widget/Model/Widget.php +++ b/app/code/core/Mage/Widget/Model/Widget.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 model for different purposes * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Model_Widget extends Varien_Object { diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php index 2c2dd9ee479..874df5464bd 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.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) */ /** * Widgets management controller * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ class Mage_Widget_Adminhtml_WidgetController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Widget/etc/adminhtml.xml b/app/code/core/Mage/Widget/etc/adminhtml.xml index 5ef32b8e271..3a15e01cb54 100644 --- a/app/code/core/Mage/Widget/etc/adminhtml.xml +++ b/app/code/core/Mage/Widget/etc/adminhtml.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/etc/config.xml b/app/code/core/Mage/Widget/etc/config.xml index 513fd713f8f..b032bde7cb3 100644 --- a/app/code/core/Mage/Widget/etc/config.xml +++ b/app/code/core/Mage/Widget/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Widget/etc/jstranslator.xml b/app/code/core/Mage/Widget/etc/jstranslator.xml index 0dc4aa1f469..abdb7e5cb19 100644 --- a/app/code/core/Mage/Widget/etc/jstranslator.xml +++ b/app/code/core/Mage/Widget/etc/jstranslator.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Widget * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php index e6b0a718301..40a65e10c2e 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php index 77d72329c43..d29feae7b51 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 12828783e2f..121b16ac734 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php index 7a196225240..7a22ad1f4dd 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php index 9bd2a172b94..6ec4a1aa2f5 100644 --- a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php +++ b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.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_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) + */ + +/** + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Model_Config_Source_Summary { diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php index 8ea6b394191..90691ead7c7 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.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 model resource * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team * @deprecated */ class Mage_Wishlist_Model_Mysql4_Wishlist extends Mage_Wishlist_Model_Resource_Wishlist diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item.php b/app/code/core/Mage/Wishlist/Model/Resource/Item.php index a8c3b23bae3..ceb58595197 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item.php @@ -27,10 +27,6 @@ */ class Mage_Wishlist_Model_Resource_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('wishlist/item', 'wishlist_item_id'); diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php index 29f03b67ad4..4b7945ba4ee 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.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 resource model * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Model_Resource_Wishlist extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Wishlist/Model/Session.php b/app/code/core/Mage/Wishlist/Model/Session.php index 11389a654ad..c5d2a1a8901 100644 --- a/app/code/core/Mage/Wishlist/Model/Session.php +++ b/app/code/core/Mage/Wishlist/Model/Session.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_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) */ /** diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php index 2825098fb43..99399c71240 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.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_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 model * + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team + * * @method Mage_Wishlist_Model_Resource_Wishlist _getResource() * @method Mage_Wishlist_Model_Resource_Wishlist getResource() * @method Mage_Wishlist_Model_Resource_Wishlist_Collection getCollection() @@ -32,10 +36,6 @@ * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) * @method string getVisibility() - * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team */ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php index 5f3d4e9df81..02e1bb862f5 100644 --- a/app/code/core/Mage/Wishlist/controllers/SharedController.php +++ b/app/code/core/Mage/Wishlist/controllers/SharedController.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 shared items controllers * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_SharedController extends Mage_Wishlist_Controller_Abstract { diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml index a41026ee9e9..0d75cbbfc2c 100644 --- a/app/code/core/Mage/Wishlist/etc/config.xml +++ b/app/code/core/Mage/Wishlist/etc/config.xml @@ -16,7 +16,7 @@ * @category Mage * @package Mage_Wishlist * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/etc/system.xml b/app/code/core/Mage/Wishlist/etc/system.xml index 1eb4813fdb4..0ba54b28265 100644 --- a/app/code/core/Mage/Wishlist/etc/system.xml +++ b/app/code/core/Mage/Wishlist/etc/system.xml @@ -8,15 +8,15 @@ * This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE_AFL.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/afl-3.0.php + * https://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through 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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Zend/Db/Select.php b/app/code/core/Zend/Db/Select.php index 0afb780046a..1ed07515547 100644 --- a/app/code/core/Zend/Db/Select.php +++ b/app/code/core/Zend/Db/Select.php @@ -39,7 +39,6 @@ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ - class Zend_Db_Select { const DISTINCT = 'distinct'; diff --git a/app/code/core/Zend/Db/Statement.php b/app/code/core/Zend/Db/Statement.php index 4582ac22da2..d232ec72112 100644 --- a/app/code/core/Zend/Db/Statement.php +++ b/app/code/core/Zend/Db/Statement.php @@ -41,7 +41,6 @@ */ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface { - /** * @var resource|object The driver level statement object/resource */ diff --git a/app/code/core/Zend/Mime.php b/app/code/core/Zend/Mime.php index e070aaa84f0..c8996e25c9b 100644 --- a/app/code/core/Zend/Mime.php +++ b/app/code/core/Zend/Mime.php @@ -287,8 +287,6 @@ public static function encodeBase64($str, } /** - * Constructor - * * @param null|string $boundary * @access public * @return void