diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 8a8ed01dfe1..a09c2cbf013 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -10,6 +10,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Admin/Model/Resource/Acl.php + - + message: "#^Return type \\(bool\\) of method Mage_Admin_Model_Resource_User\\:\\:delete\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Resource_Db_Abstract\\)\\) of method Mage_Core_Model_Resource_Db_Abstract\\:\\:delete\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Admin/Model/Resource/User.php + - message: "#^Call to an undefined method Mage_Admin_Model_Resource_Roles\\:\\:update\\(\\)\\.$#" count: 1 @@ -36,87 +41,72 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Catalog_Category_Tab_Design\\:\\:\\$_category\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php - - - - message: "#^Cannot call method addAttributeToSelect\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php - - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:addColumn\\(\\) invoked with 3 parameters, 2 required\\.$#" + message: "#^Return type \\(false\\) of method Mage_Adminhtml_Block_Cache_Grid\\:\\:getRowUrl\\(\\) should be compatible with return type \\(string\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:getRowUrl\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php + path: ../app/code/core/Mage/Adminhtml/Block/Cache/Grid.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getAssociatedProducts\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Catalog_Category_Checkboxes_Tree\\:\\:_getNodeJson\\(\\) should return string but returns array\\\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributes\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Catalog_Category_Tree\\:\\:_getNodeJson\\(\\) should return string but returns array\\\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributeIds\\(\\)\\.$#" + message: "#^Cannot assign offset 'checked' to string\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php - - message: "#^Variable \\$superAttributes might not be defined\\.$#" + message: "#^Cannot call method addAttributeToSelect\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributes\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Catalog_Category_Widget_Chooser\\:\\:_getNodeJson\\(\\) should return string but returns array\\\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributesAsArray\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:addColumn\\(\\) invoked with 3 parameters, 2 required\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributes\\(\\)\\.$#" + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Grid\\:\\:_prepareColumns\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareColumns\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProducts\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Catalog_Product_Edit_Action_Attribute\\:\\:_getHelper\\(\\) should return Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute but returns Mage_Core_Helper_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php - - - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributes\\(\\)\\.$#" - count: 3 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributes\\(\\)\\.$#" + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes\\:\\:_prepareForm\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Form\\)\\) of method Mage_Adminhtml_Block_Widget_Form\\:\\:_prepareForm\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductIds\\(\\)\\.$#" + message: "#^Cannot assign offset 'expanded' to string\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributeIds\\(\\)\\.$#" + message: "#^Return type \\(array\\) of method Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Categories\\:\\:_getNodeJson\\(\\) should be compatible with return type \\(string\\) of method Mage_Adminhtml_Block_Catalog_Category_Tree\\:\\:_getNodeJson\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php + path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributes\\(\\)\\.$#" + message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 2 parameters, 0 required\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:canUseAttribute\\(\\)\\.$#" + message: "#^Method Mage_Catalog_Model_Product_Type_Configurable\\:\\:canUseAttribute\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php @@ -136,29 +126,29 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Customer_Edit_Tab_Cart\\:\\:\\$_parentTemplate\\.$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php + message: "#^PHPDoc type Mage_Core_Model_Abstract of property Mage_Adminhtml_Block_Customer_Edit_Renderer_Region\\:\\:\\$_factory is not covariant with PHPDoc type Mage_Core_Model_Factory of overridden property Mage_Core_Block_Abstract\\:\\:\\$_factory\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php - - message: "#^Method Mage_Wishlist_Model_Resource_Item_Collection\\:\\:addDaysInWishlist\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Property Mage_Adminhtml_Block_Customer_Edit_Tab_View_Sales\\:\\:\\$_collection \\(Mage_Sales_Model_Entity_Sale_Collection\\) does not accept Varien_Data_Collection_Db\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php + path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Dashboard_Bar\\:\\:\\$_currency\\.$#" + message: "#^Method Mage_Wishlist_Model_Resource_Item_Collection\\:\\:addDaysInWishlist\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php + path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Dashboard_Graph\\:\\:\\$_max\\.$#" + message: "#^Method Mage_Adminhtml_Block_Customer_Sales_Order_Address_Form_Renderer_Vat\\:\\:getValidateButton\\(\\) should return Mage_Adminhtml_Block_Widget_Button but returns Mage_Core_Block_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php + path: ../app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Dashboard_Graph\\:\\:\\$_min\\.$#" + message: "#^Property Mage_Adminhtml_Block_Customer_Sales_Order_Address_Form_Renderer_Vat\\:\\:\\$_validateButton \\(Mage_Adminhtml_Block_Widget_Button\\|null\\) does not accept Mage_Core_Block_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php + path: ../app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php - message: "#^Variable \\$d might not be defined\\.$#" @@ -180,11 +170,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php - - - message: "#^Call to an undefined method Varien_Object\\:\\:isValidForSend\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php - - message: "#^Variable \\$class might not be defined\\.$#" count: 1 @@ -241,42 +226,42 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid\\:\\:\\$_filterValues\\.$#" + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Report_Grid\\:\\:_prepareCollection\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareCollection\\(\\)$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid\\:\\:\\$_locale\\.$#" + message: "#^Call to an undefined method Mage_Reports_Model_Resource_Report_Collection_Abstract\\:\\:addOrderStatusFilter\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php + path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:\\$_columnGroupBy\\.$#" - count: 1 + message: "#^Cannot call method setPeriod\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" + count: 4 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - message: "#^Call to an undefined method Mage_Reports_Model_Resource_Report_Collection_Abstract\\:\\:addOrderStatusFilter\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:addColumn\\(\\) should return Mage_Adminhtml_Block_Report_Grid_Abstract but returns Mage_Adminhtml_Block_Widget_Grid\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - message: "#^Cannot call method setPeriod\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" - count: 4 + message: "#^Method Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:getCollection\\(\\) should return Mage_Reports_Model_Grouped_Collection but returns Varien_Data_Collection\\.$#" + count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php - - message: "#^Method Mage_Adminhtml_Block_Report_Grid_Shopcart\\:\\:setStoreIds\\(\\) has invalid return type Mage_Adminhtml_Block_Report_Grid_Shopcart_Abstract\\.$#" + message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php + path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" + message: "#^Method Mage_Reports_Model_Totals\\:\\:countTotals\\(\\) invoked with 1 parameter, 3 required\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php - - message: "#^Method Mage_Reports_Model_Totals\\:\\:countTotals\\(\\) invoked with 1 parameter, 3 required\\.$#" + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Report_Product_Grid\\:\\:_afterLoadCollection\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_afterLoadCollection\\(\\)$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -286,9 +271,49 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php - - message: "#^Method Mage_Adminhtml_Block_Review_Grid_Renderer_Type\\:\\:render\\(\\) should return string but return statement is missing\\.$#" + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Report_Shopcart_Customer_Grid\\:\\:_afterLoadCollection\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_afterLoadCollection\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php + + - + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Review_Grid\\:\\:_prepareMassaction\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareMassaction\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid.php + + - + message: "#^Return type \\(int\\) of method Mage_Adminhtml_Block_Review_Grid_Filter_Type\\:\\:getCondition\\(\\) should be compatible with return type \\(array\\|null\\) of method Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select\\:\\:getCondition\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php + + - + message: "#^Return type \\(void\\) of method Mage_Adminhtml_Block_Review_Product_Grid\\:\\:_prepareColumns\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Catalog_Product_Grid\\:\\:_prepareColumns\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php + + - + message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Billing_Address\\:\\:getAddress\\(\\) should return Mage_Customer_Model_Address but returns Mage_Sales_Model_Quote_Address\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php + + - + message: "#^Property Mage_Adminhtml_Block_Sales_Order_Create_Form_Address\\:\\:\\$_addressForm \\(Mage_Customer_Model_Form\\) does not accept Mage_Eav_Model_Form\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php + + - + message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Giftmessage_Form\\:\\:getEntity\\(\\) should return Varien_Object but returns Mage_Eav_Model_Entity_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php + + - + message: "#^Property Mage_Adminhtml_Block_Sales_Order_Create_Giftmessage_Form\\:\\:\\$_entity \\(Mage_Eav_Model_Entity_Abstract\\) does not accept Varien_Object\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php + + - + message: "#^Argument of an invalid type float supplied for foreach, only iterables are supported\\.$#" + count: 2 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php - message: "#^Undefined variable\\: \\$info$#" @@ -301,9 +326,9 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php - - message: "#^Call to an undefined method Varien_Object\\:\\:canConfigure\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Shipping_Address\\:\\:getAddress\\(\\) should return Mage_Customer_Model_Address but returns Mage_Sales_Model_Quote_Address\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php - message: "#^Variable \\$button might not be defined\\.$#" @@ -330,11 +355,31 @@ parameters: count: 3 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php + - + message: "#^Return type \\(Mage_Sales_Model_Order_Creditmemo\\) of method Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php + + - + message: "#^Return type \\(Mage_Sales_Model_Order_Creditmemo\\) of method Mage_Adminhtml_Block_Sales_Order_Creditmemo_View_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php + + - + message: "#^Return type \\(Mage_Sales_Model_Order_Shipment\\) of method Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php + - message: "#^Call to an undefined method Mage_Shipping_Model_Carrier_Abstract\\:\\:isGirthAllowed\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php + - + message: "#^Method Mage_Adminhtml_Block_Sales_Order_Shipment_Packaging\\:\\:getQtyOrderedItem\\(\\) should return int\\|null but empty return statement found\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php + - message: "#^Variable \\$createLabelUrl might not be defined\\.$#" count: 1 @@ -351,9 +396,14 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php - - message: "#^Call to an undefined method Varien_Object\\:\\:load\\(\\)\\.$#" + message: "#^Return type \\(Mage_Sales_Model_Order_Shipment\\) of method Mage_Adminhtml_Block_Sales_Order_Shipment_View_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php + + - + message: "#^Property Mage_Adminhtml_Block_Sales_Order_View_Items_Renderer_Default\\:\\:\\$_giftMessage \\(Mage_GiftMessage_Model_Message\\) does not accept default value of type array\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php - message: "#^Call to an undefined method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:setOrderFilter\\(\\)\\.$#" @@ -371,9 +421,19 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php - - message: "#^Cannot call method getId\\(\\) on string\\.$#" + message: "#^Property Mage_Adminhtml_Block_Shipping_Carrier_Tablerate_Grid\\:\\:\\$_conditionName \\(string\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php + + - + message: "#^Property Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset\\:\\:\\$_element \\(Varien_Data_Form_Element_Fieldset\\) does not accept Varien_Data_Form_Element_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php + + - + message: "#^Property Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset_Element\\:\\:\\$_element \\(Varien_Data_Form_Element_Fieldset\\) does not accept Varien_Data_Form_Element_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php + path: ../app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php - message: "#^Cannot call method initForm\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#" @@ -390,11 +450,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form.php - - - message: "#^Access to an undefined property Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard\\:\\:\\$_filterStores\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php - - message: "#^Variable \\$attributes might not be defined\\.$#" count: 1 @@ -410,6 +465,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php + - + message: "#^Method Mage_Adminhtml_Block_System_Email_Template_Edit\\:\\:getUsedCurrentlyForPaths\\(\\) should return string but returns array\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php + + - + message: "#^Method Mage_Adminhtml_Block_System_Email_Template_Edit\\:\\:getUsedDefaultForPaths\\(\\) should return string but returns array\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php + - message: "#^Method Mage_Core_Model_Email_Template\\:\\:getProcessedTemplate\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#" count: 1 @@ -470,21 +535,11 @@ parameters: count: 15 path: ../app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php - - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Tag_Customer\\:\\:\\$_block\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Tag/Customer.php - - message: "#^Call to an undefined method Mage_Tag_Model_Resource_Tag_Collection\\:\\:addAttributeToFilter\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php - - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Tag_Product\\:\\:\\$_block\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Tag/Product.php - - message: "#^Binary operation \"\\*\" between string and 1 results in an error\\.$#" count: 1 @@ -495,6 +550,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php + - + message: "#^Method Mage_Adminhtml_Block_Widget_Container\\:\\:_addButtonChildBlock\\(\\) should return Mage_Adminhtml_Block_Widget_Button but returns Mage_Core_Block_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Widget/Container.php + - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 2 parameters, 0 required\\.$#" count: 2 @@ -511,14 +571,29 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - message: "#^Binary operation \"\\*\" between string and 1 results in an error\\.$#" + message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:getSubTotalItem\\(\\) should return Varien_Object but returns string\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php + path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php + + - + message: "#^Property Mage_Adminhtml_Block_Widget_Grid\\:\\:\\$defaultColumnSettings \\(array\\\\>\\) does not accept default value of type array\\\\>\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php + + - + message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Date\\:\\:_convertDate\\(\\) should return Zend_Date but returns null\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php + + - + message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Datetime\\:\\:_convertDate\\(\\) should return Zend_Date but returns null\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Options\\:\\:render\\(\\) should return string but return statement is missing\\.$#" + message: "#^Binary operation \"\\*\" between string and 1 results in an error\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php + path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php - message: "#^Call to an undefined method Mage_Adminhtml_Block_Widget_Tab_Interface\\:\\:getSkipGenerateContent\\(\\)\\.$#" @@ -536,27 +611,27 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php - - message: "#^Method Mage_Adminhtml_Block_Widget_Tabs\\:\\:addTabAfter\\(\\) should return Mage_Adminhtml_Block_Widget_Tabs but return statement is missing\\.$#" + message: "#^PHPDoc tag @param references unknown parameter\\: \\$tabNId$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$tabNId$#" + message: "#^Return type \\(Mage_Admin_Model_Session\\) of method Mage_Adminhtml_Controller_Report_Abstract\\:\\:_getSession\\(\\) should be compatible with return type \\(Mage_Adminhtml_Model_Session\\) of method Mage_Adminhtml_Controller_Action\\:\\:_getSession\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php + path: ../app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php - - message: "#^Method Mage_Adminhtml_Helper_Catalog_Product_Composite\\:\\:renderConfigureResult\\(\\) should return \\$this\\(Mage_Adminhtml_Helper_Catalog_Product_Composite\\) but return statement is missing\\.$#" + message: "#^Method Mage_Adminhtml_Model_Config\\:\\:getSection\\(\\) should return Varien_Simplexml_Element but return statement is missing\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php + path: ../app/code/core/Mage/Adminhtml/Model/Config.php - - message: "#^Method Mage_Adminhtml_Helper_Catalog_Product_Composite\\:\\:renderUpdateResult\\(\\) should return \\$this\\(Mage_Adminhtml_Helper_Catalog_Product_Composite\\) but return statement is missing\\.$#" + message: "#^Property Mage_Adminhtml_Model_Config\\:\\:\\$_config \\(Mage_Core_Model_Config_Base\\) does not accept Varien_Simplexml_Config\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php + path: ../app/code/core/Mage/Adminhtml/Model/Config.php - - message: "#^Method Mage_Adminhtml_Model_Config\\:\\:getSection\\(\\) should return Varien_Simplexml_Element but return statement is missing\\.$#" + message: "#^Property Varien_Simplexml_Config\\:\\:\\$_cacheChecksum \\(unknown_type\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Model/Config.php @@ -565,11 +640,36 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Model/Config/Data.php + - + message: "#^Property Mage_Adminhtml_Model_Config_Data\\:\\:\\$_configRoot \\(Mage_Core_Model_Config_Element\\) does not accept Varien_Simplexml_Element\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Model/Config/Data.php + - message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:load\\(\\) invoked with 1 parameter, 2\\-3 required\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php + - + message: "#^Method Mage_Adminhtml_Model_Sales_Order_Create\\:\\:initFromOrderItem\\(\\) should return Mage_Sales_Model_Quote_Item\\|string but returns \\$this\\(Mage_Adminhtml_Model_Sales_Order_Create\\)\\.$#" + count: 2 + path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php + + - + message: "#^Property Mage_Adminhtml_Model_Sales_Order_Create\\:\\:\\$_customerAddressForm \\(Mage_Customer_Model_Form\\) does not accept bool\\|Mage_Eav_Model_Form\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php + + - + message: "#^Property Mage_Adminhtml_Model_Sales_Order_Create\\:\\:\\$_customerForm \\(Mage_Customer_Model_Form\\) does not accept bool\\|Mage_Eav_Model_Form\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php + + - + message: "#^Property Mage_Adminhtml_Model_Sales_Order_Create\\:\\:\\$_wishlist \\(Mage_Wishlist_Model_Wishlist\\) does not accept false\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php + - message: "#^Variable \\$billingAddress might not be defined\\.$#" count: 2 @@ -596,19 +696,9 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php - - message: "#^Method Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type\\:\\:_afterSave\\(\\) has invalid return type Mage_Adminhtml_Model_System_Config_Catalog_Search_Type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Type.php - - - - message: "#^Method Mage_Adminhtml_Model_System_Config_Backend_Encrypted\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_Adminhtml_Model_System_Config_Backend_Encrypted\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php - - - - message: "#^Method Mage_Adminhtml_Model_System_Config_Backend_Serialized\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_Adminhtml_Model_System_Config_Backend_Serialized\\) but return statement is missing\\.$#" + message: "#^Cannot access offset 'file' on bool\\|void\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php + path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php - message: "#^Comparison operation \"\\=\\=\" between \\(Varien_Simplexml_Element\\|null\\) and 1 results in an error\\.$#" @@ -621,29 +711,39 @@ parameters: path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php - - message: "#^Variable \\$values might not be defined\\.$#" + message: "#^Method Mage_Adminhtml_Model_System_Store\\:\\:__construct\\(\\) with return type void returns \\$this\\(Mage_Adminhtml_Model_System_Store\\) but should not return anything\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - message: "#^Method Mage_Adminhtml_Model_Url\\:\\:renewSecretUrls\\(\\) should return \\$this\\(Mage_Adminhtml_Model_Url\\) but return statement is missing\\.$#" + message: "#^Variable \\$values might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/Url.php + path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - message: "#^Method Mage_Adminhtml_Catalog_Product_AttributeController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Adminhtml_Catalog_Product_AttributeController\\) but return statement is missing\\.$#" + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributes\\(\\)\\.$#" + message: "#^Return type \\(Mage_Adminhtml_Helper_Catalog_Product_Edit_Action_Attribute\\) of method Mage_Adminhtml_Catalog_Product_Action_AttributeController\\:\\:_getHelper\\(\\) should be compatible with return type \\(Mage_Adminhtml_Helper_Data\\) of method Mage_Adminhtml_Controller_Action\\:\\:_getHelper\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductAttributeIds\\(\\)\\.$#" + message: "#^Cannot access offset 'tmp_name' on bool\\|void\\.$#" count: 2 - path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php + + - + message: "#^Offset 'file' does not exist on array\\{path\\: \\(array\\|string\\), url\\: string\\}\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php + + - + message: "#^Offset 'file' does not exist on array\\{path\\: \\(array\\|string\\)\\}\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php - message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" @@ -651,9 +751,9 @@ parameters: path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php - - message: "#^Method Mage_Adminhtml_CustomerController\\:\\:cartAction\\(\\) should return string but return statement is missing\\.$#" + message: "#^Property Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController\\:\\:\\$_wishlistItem \\(Mage_Wishlist_Model_Wishlist\\) does not accept Mage_Wishlist_Model_Item\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/CustomerController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php - message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:getClassName\\(\\)\\.$#" @@ -675,6 +775,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php + - + message: "#^Return type \\(Mage_Admin_Model_Session\\) of method Mage_Adminhtml_Report_StatisticsController\\:\\:_getSession\\(\\) should be compatible with return type \\(Mage_Adminhtml_Model_Session\\) of method Mage_Adminhtml_Controller_Action\\:\\:_getSession\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php + - message: "#^Method Mage_Adminhtml_Model_Sales_Order_Create\\:\\:moveQuoteItem\\(\\) invoked with 2 parameters, 3 required\\.$#" count: 1 @@ -685,6 +790,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php + - + message: "#^Return type \\(Mage_Adminhtml_Model_Session_Quote\\) of method Mage_Adminhtml_Sales_Order_CreateController\\:\\:_getSession\\(\\) should be compatible with return type \\(Mage_Adminhtml_Model_Session\\) of method Mage_Adminhtml_Controller_Action\\:\\:_getSession\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php + - message: "#^Call to an undefined method Mage_Sales_Model_Order_Creditmemo\\:\\:void\\(\\)\\.$#" count: 1 @@ -700,6 +810,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php + - + message: "#^Method Mage_Adminhtml_Sales_Order_ShipmentController\\:\\:getShippingItemsGridAction\\(\\) should return Mage_Core_Controller_Response_Http but returns Zend_Controller_Response_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php + - message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 @@ -710,21 +825,6 @@ parameters: count: 4 path: ../app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php - - - message: "#^Method Mage_Adminhtml_System_ConfigController\\:\\:_isSectionAllowed\\(\\) should return bool but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php - - - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:clearAffectedEntityIds\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php - - - - message: "#^Cannot call method saveRow\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php - - message: "#^Variable \\$data in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -735,6 +835,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php + - + message: "#^Method Mage_Adminhtml_System_StoreController\\:\\:_backupDatabase\\(\\) should return \\$this\\(Mage_Adminhtml_System_StoreController\\) but empty return statement found\\.$#" + count: 2 + path: ../app/code/core/Mage/Adminhtml/controllers/System/StoreController.php + - message: "#^Variable \\$codeBase might not be defined\\.$#" count: 1 @@ -766,19 +871,24 @@ parameters: path: ../app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:addError\\(\\)\\.$#" - count: 3 + message: "#^Method Mage_Adminhtml_Tax_RuleController\\:\\:saveAction\\(\\) should return Mage_Core_Controller_Response_Http\\|Mage_Core_Controller_Varien_Action but return statement is missing\\.$#" + count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:addSuccess\\(\\)\\.$#" + message: "#^Method Mage_Adminhtml_Tax_RuleController\\:\\:saveAction\\(\\) should return Mage_Core_Controller_Response_Http\\|Mage_Core_Controller_Varien_Action but returns Zend_Controller_Response_Abstract\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php - - message: "#^Method Mage_Adminhtml_Tax_RuleController\\:\\:saveAction\\(\\) should return Mage_Core_Controller_Response_Http\\|Mage_Core_Controller_Varien_Action but return statement is missing\\.$#" + message: "#^Method Mage_Api_Model_Acl\\:\\:_getRoleRegistry\\(\\) should return Mage_Api_Model_Acl_Role_Registry but returns Zend_Acl_Role_Registry\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php + path: ../app/code/core/Mage/Api/Model/Acl.php + + - + message: "#^Return type \\(Zend_Cache_Core\\) of method Mage_Api_Model_Config\\:\\:getCache\\(\\) should be compatible with return type \\(Varien_Simplexml_Config_Cache_Abstract\\) of method Varien_Simplexml_Config\\:\\:getCache\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api/Model/Config.php - message: "#^Cannot call method getClassName\\(\\) on bool\\|SimpleXMLElement\\.$#" @@ -790,6 +900,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Api/Model/Resource/Roles.php + - + message: "#^Return type \\(bool\\) of method Mage_Api_Model_Resource_User\\:\\:delete\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Resource_Db_Abstract\\)\\) of method Mage_Core_Model_Resource_Db_Abstract\\:\\:delete\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api/Model/Resource/User.php + - message: "#^Call to an undefined method Mage_Api_Model_Resource_Roles\\:\\:update\\(\\)\\.$#" count: 1 @@ -805,11 +920,21 @@ parameters: count: 1 path: ../app/code/core/Mage/Api/Model/Server/Adapter/Soap.php + - + message: "#^Property Mage_Api_Model_Server_Adapter_Soap\\:\\:\\$_soap \\(SoapServer\\) does not accept Zend_Soap_Server\\.$#" + count: 1 + path: ../app/code/core/Mage/Api/Model/Server/Adapter/Soap.php + - message: "#^Result of method SoapServer\\:\\:handle\\(\\) \\(void\\) is used\\.$#" count: 1 path: ../app/code/core/Mage/Api/Model/Server/Adapter/Soap.php + - + message: "#^Return type \\(Varien_Object\\) of method Mage_Api_Model_Server_Adapter_Soap\\:\\:getController\\(\\) should be compatible with return type \\(Mage_Api_Controller_Action\\) of method Mage_Api_Model_Server_Adapter_Interface\\:\\:getController\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api/Model/Server/Adapter/Soap.php + - message: "#^Access to an undefined property object\\:\\:\\$model\\.$#" count: 2 @@ -826,75 +951,175 @@ parameters: path: ../app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php - - message: "#^Result of method SoapServer\\:\\:handle\\(\\) \\(void\\) is used\\.$#" + message: "#^Return type \\(Mage_Api_Model_Wsdl_Config\\) of method Mage_Api_Model_Server_V2_Adapter_Soap\\:\\:_getWsdlConfig\\(\\) should be compatible with return type \\(Varien_Object\\) of method Mage_Api_Model_Server_Adapter_Soap\\:\\:_getWsdlConfig\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php + path: ../app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php - - message: "#^Call to an undefined method SimpleXMLElement\\:\\:extendChild\\(\\)\\.$#" + message: "#^Result of method SoapServer\\:\\:handle\\(\\) \\(void\\) is used\\.$#" count: 1 - path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php + path: ../app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php + message: "#^Return type \\(Mage_Api_Model_Wsdl_Config\\) of method Mage_Api_Model_Server_Wsi_Adapter_Soap\\:\\:_getWsdlConfig\\(\\) should be compatible with return type \\(Varien_Object\\) of method Mage_Api_Model_Server_Adapter_Soap\\:\\:_getWsdlConfig\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php - - message: "#^Variable \\$adapters might not be defined\\.$#" + message: "#^Parameter \\#1 \\$request \\(stdClass\\) of method Mage_Api_Model_Server_Wsi_Handler\\:\\:endSession\\(\\) should be compatible with parameter \\$sessionId \\(string\\) of method Mage_Api_Model_Server_Handler_Abstract\\:\\:endSession\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api2/Helper/Data.php + path: ../app/code/core/Mage/Api/Model/Server/Wsi/Handler.php - - message: "#^Method Mage_Api2_Model_Acl_Global_Rule_ResourcePermission\\:\\:setFilterValue\\(\\) should return Mage_Api2_Model_Acl_PermissionInterface but return statement is missing\\.$#" + message: "#^Return type \\(stdClass\\) of method Mage_Api_Model_Server_Wsi_Handler\\:\\:endSession\\(\\) should be compatible with return type \\(true\\) of method Mage_Api_Model_Server_Handler_Abstract\\:\\:endSession\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php + path: ../app/code/core/Mage/Api/Model/Server/Wsi/Handler.php - - message: "#^Variable \\$operationName might not be defined\\.$#" - count: 2 - path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php + message: "#^Return type \\(stdClass\\) of method Mage_Api_Model_Server_Wsi_Handler\\:\\:login\\(\\) should be compatible with return type \\(string\\) of method Mage_Api_Model_Server_Handler_Abstract\\:\\:login\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api/Model/Server/Wsi/Handler.php - - message: "#^Call to an undefined method Mage_Api2_Model_Config\\:\\:getMainRoute\\(\\)\\.$#" + message: "#^Return type \\(bool\\) of method Mage_Api_Model_Session\\:\\:clear\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Session_Abstract_Varien\\)\\) of method Mage_Core_Model_Session_Abstract_Varien\\:\\:clear\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Multicall.php + path: ../app/code/core/Mage/Api/Model/Session.php - - message: "#^Call to an undefined method Mage_Api2_Model_Resource\\:\\:_multiDelete\\(\\)\\.$#" + message: "#^Return type \\(void\\) of method Mage_Api_Model_Session\\:\\:revalidateCookie\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Session_Abstract_Varien\\)\\) of method Mage_Core_Model_Session_Abstract_Varien\\:\\:revalidateCookie\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Resource.php + path: ../app/code/core/Mage/Api/Model/Session.php - - message: "#^Method Mage_Api2_Model_Resource\\:\\:_create\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Invalid array key type array\\.$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Resource.php + path: ../app/code/core/Mage/Api/Model/Wsdl/Config.php - - message: "#^Method Mage_Api2_Model_Resource\\:\\:_multiCreate\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Call to an undefined method SimpleXMLElement\\:\\:extendChild\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Resource.php + path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php - - message: "#^Method Mage_Api2_Model_Resource\\:\\:_multiUpdate\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Return type \\(array\\) of method Mage_Api_Model_Wsdl_Config_Element\\:\\:getChildren\\(\\) should be compatible with return type \\(RecursiveIterator\\|null\\) of method RecursiveIterator\\\\:\\:getChildren\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Resource.php + path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php - - message: "#^Method Mage_Api2_Model_Resource\\:\\:_update\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Return type \\(void\\) of method Mage_Api2_Block_Adminhtml_Attribute_Grid\\:\\:_prepareCollection\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Block_Widget_Grid\\)\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareCollection\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Resource.php + path: ../app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php - - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Property Mage_Api2_Block_Adminhtml_Attribute_Tab_Resource\\:\\:\\$_treeModel \\(Mage_Api2_Model_Acl_Global_Rule_Tree\\) does not accept default value of type false\\.$#" count: 1 - path: ../app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php + path: ../app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php - - message: "#^Call to an undefined method Zend_Validate_Interface\\:\\:setMessage\\(\\)\\.$#" + message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" + count: 2 + path: ../app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php + + - + message: "#^Property Mage_Api2_Block_Adminhtml_Roles_Tab_Resources\\:\\:\\$_treeModel \\(Mage_Api2_Model_Acl_Global_Rule_Tree\\) does not accept default value of type false\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php + + - + message: "#^Cannot access offset 'order' on int\\.$#" + count: 4 + path: ../app/code/core/Mage/Api2/Helper/Data.php + + - + message: "#^Variable \\$adapters might not be defined\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Helper/Data.php + + - + message: "#^Parameter \\#1 \\$roleId \\(int\\) of method Mage_Api2_Model_Acl\\:\\:addRole\\(\\) should be compatible with parameter \\$role \\(string\\|Zend_Acl_Role_Interface\\) of method Zend_Acl\\:\\:addRole\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Acl.php + + - + message: "#^Method Mage_Api2_Model_Acl_Global_Rule_ResourcePermission\\:\\:setFilterValue\\(\\) should return Mage_Api2_Model_Acl_PermissionInterface but return statement is missing\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php + + - + message: "#^Variable \\$operationName might not be defined\\.$#" + count: 2 + path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php + + - + message: "#^Method Mage_Api2_Model_Config\\:\\:getResourceGroup\\(\\) should return bool\\|Mage_Core_Model_Config_Element but returns Varien_Simplexml_Element\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Config.php + + - + message: "#^Call to an undefined method Mage_Api2_Model_Config\\:\\:getMainRoute\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Multicall.php + + - + message: "#^Property Mage_Api2_Model_Request\\:\\:\\$_interpreter \\(Mage_Api2_Model_Request_Interpreter_Interface\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Request.php + + - + message: "#^Call to an undefined method Mage_Api2_Model_Resource\\:\\:_multiDelete\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource.php + + - + message: "#^Method Mage_Api2_Model_Resource\\:\\:_create\\(\\) invoked with 1 parameter, 0 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource.php + + - + message: "#^Method Mage_Api2_Model_Resource\\:\\:_getSubModel\\(\\) should return \\$this\\(Mage_Api2_Model_Resource\\) but returns Mage_Api2_Model_Resource\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource.php + + - + message: "#^Method Mage_Api2_Model_Resource\\:\\:_multiCreate\\(\\) invoked with 1 parameter, 0 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource.php + + - + message: "#^Method Mage_Api2_Model_Resource\\:\\:_multiUpdate\\(\\) invoked with 1 parameter, 0 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource.php + + - + message: "#^Method Mage_Api2_Model_Resource\\:\\:_update\\(\\) invoked with 1 parameter, 0 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource.php + + - + message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php + + - + message: "#^Property Mage_Api2_Model_Resource_Validator_Eav\\:\\:\\$_eavForm \\(Mage_Eav_Model_Form\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php + + - + message: "#^Call to an undefined method Zend_Validate_Interface\\:\\:setMessage\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php + - + message: "#^Method Mage_Api2_Model_Response\\:\\:setMimeType\\(\\) should return \\$this\\(Mage_Api2_Model_Response\\) but returns Zend_Controller_Response_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Response.php + + - + message: "#^Parameter \\#1 \\$request \\(Mage_Api2_Model_Request\\) of method Mage_Api2_Model_Route_Abstract\\:\\:match\\(\\) should be compatible with parameter \\$path \\(string\\) of method Zend_Controller_Router_Route\\:\\:match\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Api2/Model/Route/Abstract.php + - message: "#^Constructor of class Mage_Api2_Model_Route_ApiType has an unused parameter \\$defaults\\.$#" count: 1 @@ -921,27 +1146,27 @@ parameters: path: ../app/code/core/Mage/Api2/Model/Route/ApiType.php - - message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:authorize\\(\\)\\.$#" + message: "#^Call to an undefined method Varien_Object\\:\\:decrypt\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - message: "#^Call to an undefined method Varien_Object\\:\\:decrypt\\(\\)\\.$#" + message: "#^Call to an undefined method Varien_Object\\:\\:encrypt\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - message: "#^Call to an undefined method Varien_Object\\:\\:encrypt\\(\\)\\.$#" + message: "#^Method Mage_Authorizenet_Model_Directpost\\:\\:initialize\\(\\) should return \\$this\\(Mage_Authorizenet_Model_Directpost\\) but return statement is missing\\.$#" count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - message: "#^Method Mage_Authorizenet_Model_Directpost\\:\\:authorize\\(\\) should return Mage_Paygate_Model_Authorizenet but return statement is missing\\.$#" + message: "#^Return type \\(bool\\) of method Mage_Authorizenet_Model_Directpost\\:\\:validate\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Cc\\)\\) of method Mage_Payment_Model_Method_Cc\\:\\:validate\\(\\)$#" count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - message: "#^Method Mage_Authorizenet_Model_Directpost\\:\\:initialize\\(\\) should return \\$this\\(Mage_Authorizenet_Model_Directpost\\) but return statement is missing\\.$#" + message: "#^Return type \\(void\\) of method Mage_Authorizenet_Model_Directpost\\:\\:authorize\\(\\) should be compatible with return type \\(\\$this\\(Mage_Paygate_Model_Authorizenet\\)\\) of method Mage_Paygate_Model_Authorizenet\\:\\:authorize\\(\\)$#" count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -955,11 +1180,26 @@ parameters: count: 1 path: ../app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php + - + message: "#^Method Mage_Authorizenet_Directpost_PaymentController\\:\\:_getIframeBlock\\(\\) should return Mage_Authorizenet_Block_Directpost_Iframe but returns Mage_Core_Block_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php + - message: "#^Variable \\$params might not be defined\\.$#" count: 1 path: ../app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php + - + message: "#^Method Mage_Backup_Helper_Data\\:\\:getCreateSuccessMessageByType\\(\\) should return string but empty return statement found\\.$#" + count: 1 + path: ../app/code/core/Mage/Backup/Helper/Data.php + + - + message: "#^Property Mage_Backup_Model_Backup\\:\\:\\$_handler \\(resource\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Backup/Model/Backup.php + - message: "#^Variable \\$filePath might not be defined\\.$#" count: 4 @@ -971,19 +1211,59 @@ parameters: path: ../app/code/core/Mage/Backup/Model/Observer.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#" + message: "#^Property Mage_Backup_Model_Resource_Db\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Backup/Model/Resource/Db.php + + - + message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php + + - + message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php + + - + message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsIds\\(\\)\\.$#" + message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectionsCollection\\(\\)\\.$#" + message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Radio\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php + + - + message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Radio\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php + + - + message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Select\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php + + - + message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Select\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php + + - + message: "#^Method Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection\\:\\:isUsedWebsitePrice\\(\\) should return string but returns bool\\.$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php + + - + message: "#^Return type \\(void\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tabs\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php - message: "#^Variable \\$_items might not be defined\\.$#" @@ -1026,19 +1306,14 @@ parameters: path: ../app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Bundle/Model/Observer.php - - - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsIds\\(\\)\\.$#" + message: "#^PHPDoc type bool of property Mage_Bundle_Model_CatalogIndex_Data_Bundle\\:\\:\\$_haveChildren is not covariant with PHPDoc type array\\ of overridden property Mage_CatalogIndex_Model_Data_Simple\\:\\:\\$_haveChildren\\.$#" count: 1 - path: ../app/code/core/Mage/Bundle/Model/Observer.php + path: ../app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectionsCollection\\(\\)\\.$#" + message: "#^Property Mage_Bundle_Model_CatalogIndex_Data_Bundle\\:\\:\\$_haveChildren \\(bool\\) does not accept default value of type array\\\\.$#" count: 1 - path: ../app/code/core/Mage/Bundle/Model/Observer.php + path: ../app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php - message: "#^Call to an undefined method Mage_Bundle_Model_Resource_Price_Index\\:\\:reindexProduct\\(\\)\\.$#" @@ -1051,52 +1326,47 @@ parameters: path: ../app/code/core/Mage/Bundle/Model/Product/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#" + message: "#^Method Mage_Bundle_Model_Product_Price\\:\\:getOptions\\(\\) should return Mage_Bundle_Model_Resource_Option_Collection but returns array\\.$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsIds\\(\\)\\.$#" + message: "#^Method Mage_Bundle_Model_Product_Price\\:\\:getPrice\\(\\) should return string but returns int\\.$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectionsByIds\\(\\)\\.$#" - count: 1 + message: "#^Offset 'option_id' does not exist on array\\{final_price\\: mixed\\}\\.$#" + count: 4 path: ../app/code/core/Mage/Bundle/Model/Product/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectionsCollection\\(\\)\\.$#" + message: "#^Return type \\(string\\) of method Mage_Bundle_Model_Product_Price\\:\\:getPrice\\(\\) should be compatible with return type \\(float\\) of method Mage_Catalog_Model_Product_Type_Price\\:\\:getPrice\\(\\)$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsCollection\\(\\)\\.$#" - count: 1 + message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Price\\:\\:getSelectionFinalTotalPrice\\(\\)\\.$#" + count: 2 path: ../app/code/core/Mage/Bundle/Model/Product/Type.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getOptionsIds\\(\\)\\.$#" + message: "#^Parameter \\#1 \\$product \\(Mage_Catalog_Model_Product\\) of method Mage_Bundle_Model_Product_Type\\:\\:getForceChildItemQtyChanges\\(\\) should be compatible with parameter \\$product \\(null\\) of method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getForceChildItemQtyChanges\\(\\)$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Type.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectionsCollection\\(\\)\\.$#" + message: "#^Parameter \\#2 \\$product \\(Mage_Catalog_Model_Product\\) of method Mage_Bundle_Model_Product_Type\\:\\:prepareQuoteItemQty\\(\\) should be compatible with parameter \\$product \\(null\\) of method Mage_Catalog_Model_Product_Type_Abstract\\:\\:prepareQuoteItemQty\\(\\)$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Type.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Price\\:\\:getSelectionFinalTotalPrice\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Bundle/Model/Product/Type.php - - - - message: "#^Call to an undefined method Varien_Object\\:\\:isMultiSelection\\(\\)\\.$#" - count: 2 + message: "#^Parameter \\#4 \\$product \\(Mage_Catalog_Model_Product\\) of method Mage_Bundle_Model_Product_Type\\:\\:updateQtyOption\\(\\) should be compatible with parameter \\$product \\(null\\) of method Mage_Catalog_Model_Product_Type_Abstract\\:\\:updateQtyOption\\(\\)$#" + count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Type.php - - message: "#^Method Mage_Bundle_Model_Product_Type\\:\\:beforeSave\\(\\) should return Mage_Catalog_Model_Product_Type_Abstract but return statement is missing\\.$#" + message: "#^Return type \\(int\\) of method Mage_Bundle_Model_Product_Type\\:\\:prepareQuoteItemQty\\(\\) should be compatible with return type \\(float\\) of method Mage_Catalog_Model_Product_Type_Abstract\\:\\:prepareQuoteItemQty\\(\\)$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Product/Type.php @@ -1106,7 +1376,7 @@ parameters: path: ../app/code/core/Mage/Bundle/Model/Product/Type.php - - message: "#^Call to an undefined method Varien_Object\\:\\:addSelection\\(\\)\\.$#" + message: "#^Property Mage_Bundle_Model_Resource_Option_Collection\\:\\:\\$_itemIds \\(array\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php @@ -1165,6 +1435,16 @@ parameters: count: 9 path: ../app/code/core/Mage/Captcha/Model/Observer.php + - + message: "#^Property Zend_Captcha_Word\\:\\:\\$_word \\(string\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Captcha/Model/Zend.php + + - + message: "#^Return type \\(Mage_Customer_Model_Session\\) of method Mage_Captcha_Model_Zend\\:\\:getSession\\(\\) should be compatible with return type \\(Zend_Session_Namespace\\) of method Zend_Captcha_Word\\:\\:getSession\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Captcha/Model/Zend.php + - message: "#^Call to an undefined method Mage_Captcha_Model_Interface\\:\\:getImgSrc\\(\\)\\.$#" count: 1 @@ -1175,11 +1455,26 @@ parameters: count: 1 path: ../app/code/core/Mage/Captcha/controllers/RefreshController.php + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Breadcrumbs.php + + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Navigation.php + - message: "#^Cannot call method count\\(\\) on string\\.$#" count: 2 path: ../app/code/core/Mage/Catalog/Block/Navigation.php + - + message: "#^Property Mage_Catalog_Block_Navigation\\:\\:\\$_currentCategoryKey \\(string\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Navigation.php + - message: "#^Variable \\$htmlChildren in empty\\(\\) always exists and is always falsy\\.$#" count: 1 @@ -1190,50 +1485,75 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Block/Product.php + - + message: "#^Property Mage_Catalog_Block_Product_Abstract\\:\\:\\$_reviewsHelperBlock \\(Mage_Review_Block_Helper\\|null\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Product/Abstract.php + - message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\:\\:useProductItem\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Block/Product/Compare/List.php - - message: "#^Cannot call method getFile\\(\\) on null\\.$#" + message: "#^Method Mage_Catalog_Block_Product_List\\:\\:_getProductCollection\\(\\) should return Mage_Catalog_Model_Resource_Product_Collection but returns Mage_Eav_Model_Entity_Collection_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Product/List.php + + - + message: "#^Property Mage_Catalog_Block_Product_List_Crosssell\\:\\:\\$_itemCollection \\(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection\\) does not accept Mage_Catalog_Model_Resource_Product_Link_Product_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php + + - + message: "#^Method Mage_Catalog_Block_Product_List_Toolbar\\:\\:getDefaultPerPageValue\\(\\) should return string but returns int\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php + + - + message: "#^Property Mage_Catalog_Block_Product_List_Toolbar\\:\\:\\$_availableMode \\(string\\) does not accept array\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Block/Product/Gallery.php + path: ../app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php + + - + message: "#^Property Mage_Catalog_Block_Product_List_Toolbar\\:\\:\\$_availableMode \\(string\\) does not accept array\\\\.$#" + count: 4 + path: ../app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php - - message: "#^Cannot call method getPath\\(\\) on null\\.$#" + message: "#^Property Mage_Catalog_Block_Product_List_Toolbar\\:\\:\\$_availableMode \\(string\\) does not accept default value of type array\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Block/Product/Gallery.php + path: ../app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php - - message: "#^Cannot call method getUrl\\(\\) on null\\.$#" + message: "#^Property Mage_Catalog_Block_Product_List_Toolbar\\:\\:\\$_collection \\(Mage_Core_Model_Resource_Db_Collection_Abstract\\) does not accept Varien_Data_Collection\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Block/Product/Gallery.php + path: ../app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php - - message: "#^Cannot call method getValueId\\(\\) on true\\.$#" + message: "#^Property Mage_Catalog_Block_Product_New\\:\\:\\$_productsCount \\(null\\) does not accept int\\.$#" count: 2 - path: ../app/code/core/Mage/Catalog/Block/Product/Gallery.php + path: ../app/code/core/Mage/Catalog/Block/Product/New.php - - message: "#^Method Mage_Catalog_Block_Product_View_Tabs\\:\\:addTab\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Method Mage_Catalog_Block_Product_View_Options_Type_Date\\:\\:_getValueWithLeadingZeros\\(\\) should return string but returns int\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Block/Product/View/Tabs.php + path: ../app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributes\\(\\)\\.$#" + message: "#^Invalid array key type array\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProducts\\(\\)\\.$#" + message: "#^Method Mage_Catalog_Block_Product_View_Type_Configurable\\:\\:_getHelper\\(\\) should return Mage_Catalog_Helper_Product_Type_Composite but returns Mage_Core_Helper_Abstract\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getAssociatedProducts\\(\\)\\.$#" + message: "#^Property Mage_Catalog_Block_Product_Widget_Html_Pager\\:\\:\\$_lastPage \\(int\\) does not accept float\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php + path: ../app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php - message: "#^Variable \\$finish might not be defined\\.$#" @@ -1245,6 +1565,21 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php + - + message: "#^Property Mage_Catalog_Block_Product_Widget_New\\:\\:\\$_pager \\(Mage_Catalog_Block_Product_Widget_Html_Pager\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Product/Widget/New.php + + - + message: "#^Parameter \\#1 \\$category \\(Mage_Catalog_Model_Category\\) of method Mage_Catalog_Block_Seo_Sitemap_Category\\:\\:getItemUrl\\(\\) should be compatible with parameter \\$item \\(Mage_Catalog_Block_Seo_Sitemap_Abstract\\) of method Mage_Catalog_Block_Seo_Sitemap_Abstract\\:\\:getItemUrl\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php + + - + message: "#^Parameter \\#1 \\$product \\(Mage_Catalog_Model_Product\\) of method Mage_Catalog_Block_Seo_Sitemap_Product\\:\\:getItemUrl\\(\\) should be compatible with parameter \\$item \\(Mage_Catalog_Block_Seo_Sitemap_Abstract\\) of method Mage_Catalog_Block_Seo_Sitemap_Abstract\\:\\:getItemUrl\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php + - message: "#^Variable \\$finish might not be defined\\.$#" count: 1 @@ -1260,21 +1595,76 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Block/Widget/Link.php + - + message: "#^Property Mage_Catalog_Helper_Data\\:\\:\\$_categoryPath \\(string\\) does not accept array\\\\>\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Data.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_angle \\(int\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_imageFile \\(string\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_model \\(Mage_Catalog_Model_Product_Image\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_product \\(Mage_Catalog_Model_Product\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_watermark \\(string\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_watermarkImageOpacity \\(int\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_watermarkPosition \\(string\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Image\\:\\:\\$_watermarkSize \\(string\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Image.php + + - + message: "#^Property Mage_Catalog_Helper_Output\\:\\:\\$_templateProcessor \\(Varien_Filter_Template\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Output.php + - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute_Frontend_Abstract\\:\\:getUrl\\(\\)\\.$#" count: 3 path: ../app/code/core/Mage/Catalog/Helper/Product.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectedAttributesInfo\\(\\)\\.$#" + message: "#^Property Mage_Catalog_Helper_Product_Compare\\:\\:\\$_itemCollection \\(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection\\) does not accept Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Helper/Product/Configuration.php + path: ../app/code/core/Mage/Catalog/Helper/Product/Compare.php - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:loadSelf\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Helper/Product/Flat.php + - + message: "#^Argument of an invalid type float supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php + - message: "#^Call to an undefined method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:setStoreId\\(\\)\\.$#" count: 1 @@ -1285,6 +1675,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Abstract.php + - + message: "#^Return type \\(Mage_Catalog_Model_Resource_Collection_Abstract\\) of method Mage_Catalog_Model_Abstract\\:\\:getResourceCollection\\(\\) should be compatible with return type \\(Mage_Core_Model_Resource_Db_Collection_Abstract\\) of method Mage_Core_Model_Abstract\\:\\:getResourceCollection\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Abstract.php + - message: "#^Call to an undefined method Mage_Catalog_Model_Api_Resource\\:\\:_checkAttributeAcl\\(\\)\\.$#" count: 1 @@ -1296,32 +1691,32 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Api/Resource.php - - message: "#^Method Mage_Catalog_Model_Api2_Product_Image_Rest_Admin_V1\\:\\:_create\\(\\) should return string but return statement is missing\\.$#" + message: "#^Argument of an invalid type float supplied for foreach, only iterables are supported\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php + path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:toOptionArray\\(\\)\\.$#" + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php + path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\:\\:formatDate\\(\\)\\.$#" + message: "#^Return type \\(int\\) of method Mage_Catalog_Model_Api2_Product_Rest_Customer_V1\\:\\:_getCustomerGroupId\\(\\) should be compatible with return type \\(null\\) of method Mage_Catalog_Model_Api2_Product_Rest\\:\\:_getCustomerGroupId\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php + path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php - - message: "#^Method Mage_Catalog_Model_Api2_Product_Validator_Product\\:\\:_validateAttributeSet\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Return type \\(int\\) of method Mage_Catalog_Model_Api2_Product_Rest_Guest_V1\\:\\:_getCustomerGroupId\\(\\) should be compatible with return type \\(null\\) of method Mage_Catalog_Model_Api2_Product_Rest\\:\\:_getCustomerGroupId\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php + path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php - - message: "#^Method Mage_Catalog_Model_Api2_Product_Validator_Product\\:\\:_validateProductType\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:toOptionArray\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php - - message: "#^Method Mage_Catalog_Model_Api2_Product_Validator_Product\\:\\:_validateSku\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\:\\:formatDate\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php @@ -1330,6 +1725,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php + - + message: "#^Method Mage_Catalog_Model_Category\\:\\:getDefaultAttributeSetId\\(\\) should return int but returns string\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Category.php + + - + message: "#^Method Mage_Catalog_Model_Category\\:\\:getParentDesignCategory\\(\\) should return \\$this\\(Mage_Catalog_Model_Category\\) but returns Mage_Catalog_Model_Category\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Category.php + - message: "#^Cannot call method getRootCategoryId\\(\\) on int\\|string\\.$#" count: 1 @@ -1340,6 +1745,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php + - + message: "#^Cannot access offset 'file' on bool\\|void\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php + + - + message: "#^Property Mage_Catalog_Model_Category_Url\\:\\:\\$_url \\(Mage_Core_Model_Url\\) does not accept bool\\|Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Category/Url.php + - message: "#^Call to an undefined method Mage_Catalog_Model_Config\\:\\:_init\\(\\)\\.$#" count: 1 @@ -1365,6 +1780,21 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php + - + message: "#^Property Mage_Catalog_Model_Convert_Adapter_Product\\:\\:\\$_galleryBackendModel \\(Mage_Catalog_Model_Product_Attribute_Backend_Media\\) does not accept Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php + + - + message: "#^Property Mage_Catalog_Model_Convert_Adapter_Product\\:\\:\\$_productModel \\(Mage_Catalog_Model_Product\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php + + - + message: "#^Return type \\(Mage_Catalog_Model_Resource_Product_Collection\\) of method Mage_Catalog_Model_Convert_Adapter_Product\\:\\:_getCollectionForLoad\\(\\) should be compatible with return type \\(Mage_Eav_Model_Entity_Collection\\) of method Mage_Eav_Model_Convert_Adapter_Entity\\:\\:_getCollectionForLoad\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php + - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" count: 1 @@ -1386,9 +1816,54 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Design.php - - message: "#^Comparison operation \"\\=\\=\" between Mage_Catalog_Model_Resource_Eav_Attribute and 1 results in an error\\.$#" + message: "#^Property Mage_Catalog_Model_Entity_Product_Attribute_Design_Options_Container\\:\\:\\$_configNodePath \\(Mage_Core_Model_Config_Element\\) does not accept string\\.$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php + path: ../app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php + + - + message: "#^Method Mage_Catalog_Model_Factory\\:\\:getCategoryUrlInstance\\(\\) should return Mage_Catalog_Model_Category_Url but returns bool\\|Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Factory.php + + - + message: "#^Method Mage_Catalog_Model_Factory\\:\\:getCategoryUrlRewriteHelper\\(\\) should return Mage_Catalog_Helper_Category_Url_Rewrite_Interface but returns Mage_Core_Helper_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Factory.php + + - + message: "#^Method Mage_Catalog_Model_Factory\\:\\:getProductUrlInstance\\(\\) should return Mage_Catalog_Model_Product_Url but returns bool\\|Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Factory.php + + - + message: "#^Method Mage_Catalog_Model_Factory\\:\\:getProductUrlRewriteHelper\\(\\) should return Mage_Catalog_Helper_Product_Url_Rewrite_Interface but returns Mage_Core_Helper_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Factory.php + + - + message: "#^Comparison operation \"\\=\\=\" between Mage_Catalog_Model_Resource_Eav_Attribute and 1 results in an error\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php + + - + message: "#^Parameter \\#2 \\$filterBlock \\(Varien_Object\\) of method Mage_Catalog_Model_Layer_Filter_Attribute\\:\\:apply\\(\\) should be compatible with parameter \\$filterBlock \\(null\\) of method Mage_Catalog_Model_Layer_Filter_Abstract\\:\\:apply\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php + + - + message: "#^Argument of an invalid type int supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php + + - + message: "#^Parameter \\#2 \\$filterBlock \\(Mage_Catalog_Block_Layer_Filter_Decimal\\) of method Mage_Catalog_Model_Layer_Filter_Decimal\\:\\:apply\\(\\) should be compatible with parameter \\$filterBlock \\(null\\) of method Mage_Catalog_Model_Layer_Filter_Abstract\\:\\:apply\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php + + - + message: "#^Argument of an invalid type int\\\\|int\\<1, max\\> supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php - message: "#^Method Mage_Catalog_Model_Resource_Category_Flat\\:\\:move\\(\\) invoked with 3 parameters, 1 required\\.$#" @@ -1396,12 +1871,27 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Observer.php - - message: "#^Method Mage_Catalog_Model_Product\\:\\:_afterDeleteCommit\\(\\) should return \\$this\\(Mage_Catalog_Model_Product\\) but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\:\\:addImage\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Product.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\:\\:addImage\\(\\)\\.$#" + message: "#^Method Mage_Catalog_Model_Product\\:\\:canBeShowInCategory\\(\\) should return bool but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product.php + + - + message: "#^Method Mage_Catalog_Model_Product\\:\\:duplicate\\(\\) should return \\$this\\(Mage_Catalog_Model_Product\\) but returns Mage_Catalog_Model_Product\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product.php + + - + message: "#^Method Mage_Catalog_Model_Product\\:\\:getDefaultAttributeSetId\\(\\) should return int but returns string\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product.php + + - + message: "#^Property Mage_Catalog_Model_Product\\:\\:\\$_typeInstance \\(Mage_Catalog_Model_Product_Type_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Product.php @@ -1436,27 +1926,12 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Product/Api/V2.php - - message: "#^Method Mage_Catalog_Model_Product_Attribute_Api\\:\\:remove\\(\\) should return bool but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php - - - - message: "#^Method Mage_Catalog_Model_Product_Attribute_Backend_Media\\:\\:afterLoad\\(\\) should return \\$this\\(Mage_Catalog_Model_Product_Attribute_Backend_Media\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php - - - - message: "#^Call to an undefined method Varien_Object\\:\\:isRecurring\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php - - - - message: "#^Method Mage_Catalog_Model_Product_Attribute_Backend_Recurring\\:\\:beforeSave\\(\\) should return \\$this\\(Mage_Catalog_Model_Product_Attribute_Backend_Recurring\\) but return statement is missing\\.$#" + message: "#^Parameter \\#3 \\$attributes \\(stdClass\\) of method Mage_Catalog_Model_Product_Api_V2\\:\\:info\\(\\) should be compatible with parameter \\$attributes \\(array\\) of method Mage_Catalog_Model_Product_Api\\:\\:info\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php + path: ../app/code/core/Mage/Catalog/Model/Product/Api/V2.php - - message: "#^Cannot call method getBackend\\(\\) on bool\\|Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute\\.$#" + message: "#^Cannot call method getBackend\\(\\) on bool\\|Mage_Catalog_Model_Resource_Attribute\\.$#" count: 11 path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php @@ -1465,6 +1940,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php + - + message: "#^Parameter \\#1 \\$data \\(stdClass\\) of method Mage_Catalog_Model_Product_Attribute_Media_Api_V2\\:\\:_prepareImageData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Catalog_Model_Product_Attribute_Media_Api\\:\\:_prepareImageData\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php + - message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item\\:\\:clean\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 @@ -1486,22 +1966,32 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Configuration_Item_Option_Interface\\:\\:getId\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php + message: "#^Parameter \\#5 \\$identifierType \\(null\\) of method Mage_Catalog_Model_Product_Link_Api_V2\\:\\:assign\\(\\) should be compatible with parameter \\$identifierType \\(string\\) of method Mage_Catalog_Model_Product_Link_Api\\:\\:assign\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Configuration_Item_Option_Interface\\:\\:setValue\\(\\)\\.$#" + message: "#^Parameter \\#5 \\$identifierType \\(null\\) of method Mage_Catalog_Model_Product_Link_Api_V2\\:\\:update\\(\\) should be compatible with parameter \\$identifierType \\(string\\) of method Mage_Catalog_Model_Product_Link_Api\\:\\:update\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php + path: ../app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php + + - + message: "#^Method Mage_Catalog_Model_Product_Option\\:\\:getValuesCollection\\(\\) should return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection but returns Mage_Catalog_Model_Resource_Product_Option_Value_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Option.php - - message: "#^Method Mage_Catalog_Model_Product_Option_Type_File\\:\\:_validateFile\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Method Mage_Catalog_Model_Product_Option\\:\\:groupFactory\\(\\) should return Mage_Catalog_Model_Product_Option_Type_Default but returns Mage_Core_Model_Abstract\\|false\\.$#" count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Option.php + + - + message: "#^Call to an undefined method Mage_Catalog_Model_Product_Configuration_Item_Option_Interface\\:\\:getId\\(\\)\\.$#" + count: 2 path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php - - message: "#^Method Mage_Catalog_Model_Product_Option_Type_File\\:\\:getCustomizedView\\(\\) should return string but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Catalog_Model_Product_Configuration_Item_Option_Interface\\:\\:setValue\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -1516,7 +2006,22 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Product/Status.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributes\\(\\)\\.$#" + message: "#^Method Mage_Catalog_Model_Product_Type\\:\\:priceFactory\\(\\) should return Mage_Catalog_Model_Product_Type_Price but returns Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Type.php + + - + message: "#^Method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getAttributeById\\(\\) should return Mage_Eav_Model_Entity_Attribute_Abstract but returns null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php + + - + message: "#^Method Mage_Catalog_Model_Product_Type_Configurable\\:\\:getProductByAttributes\\(\\) should return Mage_Catalog_Model_Product\\|null but returns Varien_Object\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php + + - + message: "#^Cannot access offset 'pricing_value' on true\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php @@ -1546,10 +2051,35 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Resource/Abstract.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isScopeGlobal\\(\\)\\.$#" + message: "#^Method Mage_Catalog_Model_Resource_Attribute\\:\\:isUsedBySuperProducts\\(\\) should return int but returns string\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Attribute.php + - + message: "#^Method Mage_Catalog_Model_Resource_Category\\:\\:checkId\\(\\) should return bool but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category.php + + - + message: "#^Method Mage_Catalog_Model_Resource_Category\\:\\:getChildrenAmount\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category.php + + - + message: "#^Method Mage_Catalog_Model_Resource_Category\\:\\:getChildrenCount\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category.php + + - + message: "#^Property Mage_Catalog_Model_Resource_Category\\:\\:\\$_isActiveAttributeId \\(int\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category.php + + - + message: "#^Property Mage_Catalog_Model_Resource_Category\\:\\:\\$_tree \\(Varien_Data_Tree_Db\\) does not accept Varien_Data_Tree_Dbp\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category.php + - message: "#^Variable \\$ids in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -1560,6 +2090,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php + - + message: "#^Method Mage_Catalog_Model_Resource_Category_Flat\\:\\:checkId\\(\\) should return bool but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php + - message: "#^Variable \\$options might not be defined\\.$#" count: 1 @@ -1600,11 +2135,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php - - - message: "#^Access to an undefined property Mage_Catalog_Model_Resource_Category_Tree\\:\\:\\$_inactiveItems\\.$#" - count: 2 - path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php - - message: "#^Call to an undefined method Zend_Db_Adapter_Abstract\\:\\:getCheckSql\\(\\)\\.$#" count: 2 @@ -1626,12 +2156,22 @@ parameters: path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php - - message: "#^Binary operation \"\\-\" between int and non-falsy-string results in an error\\.$#" + message: "#^Parameter \\#1 \\$category \\(Mage_Catalog_Model_Category\\) of method Mage_Catalog_Model_Resource_Category_Tree\\:\\:move\\(\\) should be compatible with parameter \\$node \\(Varien_Data_Tree_Node\\) of method Varien_Data_Tree_Dbp\\:\\:move\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php + + - + message: "#^Property Mage_Catalog_Model_Resource_Category_Tree\\:\\:\\$_isActiveAttributeId \\(int\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php + + - + message: "#^Binary operation \"\\-\" between int and non\\-falsy\\-string results in an error\\.$#" count: 2 path: ../app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php - - message: "#^Binary operation \"\\-\" between non-falsy-string and 1 results in an error\\.$#" + message: "#^Binary operation \"\\-\" between non\\-falsy\\-string and 1 results in an error\\.$#" count: 2 path: ../app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php @@ -1640,6 +2180,21 @@ parameters: count: 2 path: ../app/code/core/Mage/Catalog/Model/Resource/Product.php + - + message: "#^Method Mage_Catalog_Model_Resource_Product\\:\\:getIdBySku\\(\\) should return int\\|false but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product.php + + - + message: "#^Method Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media\\:\\:insertGallery\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php + + - + message: "#^Call to an undefined method Varien_Object\\:\\:formatUrlKey\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php + - message: "#^Method Mage_Catalog_Model_Url\\:\\:refreshProductRewrites\\(\\) invoked with 3 parameters, 1 required\\.$#" count: 1 @@ -1675,16 +2230,51 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php + - + message: "#^Method Mage_Catalog_Model_Resource_Product_Collection\\:\\:getProductCountSelect\\(\\) should return Varien_Db_Select but returns Zend_Db_Select\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php + + - + message: "#^Property Mage_Catalog_Model_Resource_Product_Collection\\:\\:\\$_allIdsCache \\(array\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php + + - + message: "#^Property Mage_Catalog_Model_Resource_Product_Collection\\:\\:\\$_productCountSelect \\(Zend_Db_Select\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php + + - + message: "#^Property Mage_Catalog_Model_Resource_Product_Collection\\:\\:\\$_urlRewriteCategory \\(int\\) does not accept default value of type string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php + - message: "#^Variable \\$websiteId might not be defined\\.$#" count: 3 path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php + - + message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item\\:\\:getCount\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php + + - + message: "#^Method Mage_Catalog_Model_Resource_Product_Flat\\:\\:getTypeId\\(\\) should return int but returns string\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php + - message: "#^Comparison operation \"\\>\" between int\\<0, max\\> and Varien_Simplexml_Element\\|false results in an error\\.$#" count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php + - + message: "#^Method Mage_Catalog_Model_Resource_Product_Indexer_Abstract\\:\\:_getAttribute\\(\\) should return Mage_Catalog_Model_Resource_Eav_Attribute but returns Mage_Eav_Model_Entity_Attribute_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php + - message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#" count: 1 @@ -1705,26 +2295,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php - - - message: "#^Call to an undefined method Varien_Object\\:\\:addValue\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php - - - - message: "#^Cannot call method addTitleToResult\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php - - - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProductIds\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php - - - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProducts\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php - - message: "#^Variable \\$category might not be defined\\.$#" count: 1 @@ -1740,11 +2310,21 @@ parameters: count: 2 path: ../app/code/core/Mage/Catalog/Model/Resource/Url.php + - + message: "#^Property Mage_Catalog_Model_Url\\:\\:\\$_rewrite \\(Varien_Object\\) does not accept null\\.$#" + count: 2 + path: ../app/code/core/Mage/Catalog/Model/Url.php + - message: "#^Call to an undefined method Mage_CatalogIndex_Model_Resource_Attribute\\:\\:checkCount\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/CatalogIndex/Model/Attribute.php + - + message: "#^Property Mage_CatalogIndex_Model_Data_Abstract\\:\\:\\$_typeInstance \\(Mage_Catalog_Model_Product_Type_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php + - message: "#^Variable \\$idField might not be defined\\.$#" count: 1 @@ -1755,6 +2335,26 @@ parameters: count: 1 path: ../app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php + - + message: "#^Parameter \\#1 \\$product \\(array\\) of method Mage_CatalogIndex_Model_Data_Grouped\\:\\:getFinalPrice\\(\\) should be compatible with parameter \\$product \\(int\\) of method Mage_CatalogIndex_Model_Data_Abstract\\:\\:getFinalPrice\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php + + - + message: "#^Return type \\(false\\) of method Mage_CatalogIndex_Model_Data_Grouped\\:\\:getFinalPrice\\(\\) should be compatible with return type \\(float\\) of method Mage_CatalogIndex_Model_Data_Abstract\\:\\:getFinalPrice\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php + + - + message: "#^Property Mage_CatalogIndex_Model_Data_Simple\\:\\:\\$_haveChildren \\(array\\\\) does not accept default value of type false\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogIndex/Model/Data/Simple.php + + - + message: "#^Property Mage_CatalogIndex_Model_Data_Virtual\\:\\:\\$_haveChildren \\(array\\\\) does not accept default value of type false\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php + - message: "#^Variable \\$kill in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -1766,19 +2366,19 @@ parameters: path: ../app/code/core/Mage/CatalogIndex/Model/Indexer.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getAssociatedProducts\\(\\)\\.$#" + message: "#^Return type \\(string\\) of method Mage_CatalogIndex_Model_Indexer_Eav\\:\\:_getIndexableAttributeConditions\\(\\) should be compatible with return type \\(array\\) of method Mage_CatalogIndex_Model_Indexer_Abstract\\:\\:_getIndexableAttributeConditions\\(\\)$#" count: 1 - path: ../app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php + path: ../app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProducts\\(\\)\\.$#" + message: "#^Return type \\(string\\) of method Mage_CatalogIndex_Model_Indexer_Price\\:\\:_getIndexableAttributeConditions\\(\\) should be compatible with return type \\(array\\) of method Mage_CatalogIndex_Model_Indexer_Abstract\\:\\:_getIndexableAttributeConditions\\(\\)$#" count: 1 - path: ../app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php + path: ../app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getAssociatedProducts\\(\\)\\.$#" + message: "#^Method Mage_CatalogIndex_Model_Resource_Indexer_Abstract\\:\\:saveIndex\\(\\) with return type void returns mixed but should not return anything\\.$#" count: 1 - path: ../app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php + path: ../app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php - message: "#^Binary operation \"\\*\" between string and float results in an error\\.$#" @@ -1786,14 +2386,19 @@ parameters: path: ../app/code/core/Mage/CatalogIndex/Model/Resource/Price.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getUsedProducts\\(\\)\\.$#" + message: "#^Method Mage_CatalogIndex_Model_Retreiver\\:\\:getRetreiver\\(\\) should return Mage_CatalogIndex_Model_Data_Abstract but returns Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogIndex/Model/Retreiver.php + + - + message: "#^Property Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty\\:\\:\\$_groupRenderer \\(Mage_CatalogInventory_Block_Adminhtml_Form_Field_Customergroup\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php + path: ../app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getAssociatedProducts\\(\\)\\.$#" + message: "#^Method Mage_CatalogInventory_Model_Observer\\:\\:_getQuoteItemQtyForCheck\\(\\) should return int but returns float\\.$#" count: 1 - path: ../app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php + path: ../app/code/core/Mage/CatalogInventory/Model/Observer.php - message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#" @@ -1811,9 +2416,24 @@ parameters: path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php - - message: "#^Call to an undefined method Varien_Object\\:\\:isObjectNew\\(\\)\\.$#" + message: "#^Property Mage_CatalogInventory_Model_Resource_Stock\\:\\:\\$_isConfigBackorders \\(bool\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php + + - + message: "#^Property Mage_CatalogInventory_Model_Resource_Stock\\:\\:\\$_isConfigManageStock \\(bool\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php + + - + message: "#^Return type \\(Varien_Db_Select\\) of method Mage_CatalogInventory_Model_Resource_Stock_Item_Collection\\:\\:_initSelect\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Resource_Db_Collection_Abstract\\)\\) of method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:_initSelect\\(\\)$#" count: 1 - path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php + path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php + + - + message: "#^Property Mage_CatalogInventory_Model_Stock_Item\\:\\:\\$_productInstance \\(Mage_Catalog_Model_Product\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogInventory/Model/Stock/Item.php - message: "#^Variable \\$parentItem in empty\\(\\) always exists and is not falsy\\.$#" @@ -1821,9 +2441,9 @@ parameters: path: ../app/code/core/Mage/CatalogInventory/Model/Stock/Item.php - - message: "#^Method Mage_CatalogInventory_Model_System_Config_Backend_Minsaleqty\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_CatalogInventory_Model_System_Config_Backend_Minsaleqty\\) but return statement is missing\\.$#" + message: "#^Return type \\(int\\) of method Mage_CatalogRule_Model_Action_Index_Refresh_Row\\:\\:_getProduct\\(\\) should be compatible with return type \\(null\\) of method Mage_CatalogRule_Model_Action_Index_Refresh\\:\\:_getProduct\\(\\)$#" count: 1 - path: ../app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php + path: ../app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php - message: "#^Variable \\$gId might not be defined\\.$#" @@ -1855,6 +2475,11 @@ parameters: count: 1 path: ../app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php + - + message: "#^Property Mage_CatalogSearch_Block_Result\\:\\:\\$_productCollection \\(Mage_CatalogSearch_Model_Resource_Fulltext_Collection\\) does not accept Mage_Eav_Model_Entity_Collection_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogSearch/Block/Result.php + - message: "#^Variable \\$temp might not be defined\\.$#" count: 1 @@ -1865,11 +2490,31 @@ parameters: count: 2 path: ../app/code/core/Mage/CatalogSearch/Block/Term.php + - + message: "#^Method Mage_CatalogSearch_Model_Advanced\\:\\:getProductCollection\\(\\) should return Mage_CatalogSearch_Model_Resource_Advanced_Collection but returns array\\|float\\|int\\|string\\|false\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogSearch/Model/Advanced.php + + - + message: "#^Return type \\(bool\\) of method Mage_CatalogSearch_Model_Layer_Filter_Attribute\\:\\:_getIsFilterableAttribute\\(\\) should be compatible with return type \\(Mage_Catalog_Model_Resource_Eav_Attribute\\) of method Mage_Catalog_Model_Layer_Filter_Attribute\\:\\:_getIsFilterableAttribute\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php + - message: "#^Variable \\$select might not be defined\\.$#" count: 1 path: ../app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php + - + message: "#^Property Mage_CatalogSearch_Model_Resource_Fulltext_Collection\\:\\:\\$_relevanceSortOrder \\(null\\) does not accept default value of type int\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php + + - + message: "#^Property Mage_CatalogSearch_Model_Resource_Fulltext_Collection\\:\\:\\$_relevanceSortOrder \\(null\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php + - message: "#^Cannot call method setItem\\(\\) on array\\.$#" count: 1 @@ -1881,19 +2526,19 @@ parameters: path: ../app/code/core/Mage/Checkout/Block/Cart/Crosssell.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectedAttributesInfo\\(\\)\\.$#" + message: "#^Property Mage_Checkout_Block_Cart_Shipping\\:\\:\\$_address \\(array\\) does not accept Mage_Sales_Model_Quote_Address\\.$#" count: 1 - path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php + path: ../app/code/core/Mage/Checkout/Block/Cart/Shipping.php - - message: "#^Method Mage_Checkout_Block_Onepage_Payment_Methods\\:\\:getMethodLabelAfterHtml\\(\\) should return string but return statement is missing\\.$#" + message: "#^Property Mage_Checkout_Block_Onepage_Billing\\:\\:\\$_taxvat \\(Mage_Customer_Block_Widget_Taxvat\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php + path: ../app/code/core/Mage/Checkout/Block/Onepage/Billing.php - - message: "#^Call to an undefined method Mage_Sales_Model_Service_Order\\:\\:register\\(\\)\\.$#" + message: "#^Method Mage_Checkout_Block_Onepage_Progress\\:\\:getShippingPriceInclTax\\(\\) should return float but returns string\\.$#" count: 1 - path: ../app/code/core/Mage/Checkout/controllers/OnepageController.php + path: ../app/code/core/Mage/Checkout/Block/Onepage/Progress.php - message: "#^Variable \\$storeId might not be defined\\.$#" @@ -1930,6 +2575,26 @@ parameters: count: 4 path: ../app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php + - + message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Checkout_Model_Cart_Customer_Api_V2\\:\\:_prepareCustomerAddressData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Checkout_Model_Cart_Customer_Api\\:\\:_prepareCustomerAddressData\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php + + - + message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Checkout_Model_Cart_Customer_Api_V2\\:\\:_prepareCustomerData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Checkout_Model_Cart_Customer_Api\\:\\:_prepareCustomerData\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php + + - + message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Checkout_Model_Cart_Payment_Api_V2\\:\\:_preparePaymentData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Checkout_Model_Cart_Payment_Api\\:\\:_preparePaymentData\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php + + - + message: "#^Method Mage_Checkout_Model_Cart_Product_Api_V2\\:\\:_prepareProductsData\\(\\) should return array but returns mixed\\.$#" + count: 1 + path: ../app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php + - message: "#^Variable \\$ratesResult might not be defined\\.$#" count: 1 @@ -1966,14 +2631,29 @@ parameters: path: ../app/code/core/Mage/Checkout/Model/Type/Onepage.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributesAsArray\\(\\)\\.$#" + message: "#^Comparison operation \"\\=\\=\" between 0\\|0\\.0\\|array\\|string\\|false\\|null and 0 results in an error\\.$#" count: 1 - path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Data.php + path: ../app/code/core/Mage/Checkout/controllers/CartController.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributes\\(\\)\\.$#" + message: "#^Call to an undefined method Mage_Sales_Model_Service_Order\\:\\:register\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php + path: ../app/code/core/Mage/Checkout/controllers/OnepageController.php + + - + message: "#^Cannot access offset 'cookie' on void\\|true\\.$#" + count: 1 + path: ../app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php + + - + message: "#^Method Mage_Cms_Model_Wysiwyg_Images_Storage\\:\\:getConfig\\(\\) should return Mage_Core_Model_Config_Element but returns Varien_Simplexml_Element\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php + + - + message: "#^Property Mage_Cms_Model_Wysiwyg_Images_Storage\\:\\:\\$_config \\(Mage_Core_Model_Config_Element\\) does not accept Varien_Simplexml_Element\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 2 parameters, 0 required\\.$#" @@ -1985,20 +2665,50 @@ parameters: count: 1 path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php + - + message: "#^Method Mage_ConfigurableSwatches_Helper_Productlist\\:\\:getSwatchAttribute\\(\\) should return Mage_Eav_Model_Attribute but returns Mage_Catalog_Model_Product_Type_Configurable_Attribute\\.$#" + count: 1 + path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php + + - + message: "#^Property Mage_ConfigurableSwatches_Helper_Productlist\\:\\:\\$_swatchAttribute \\(Mage_Catalog_Model_Product_Type_Configurable_Attribute\\) does not accept Mage_Eav_Model_Entity_Attribute_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php + + - + message: "#^Property Mage_ConfigurableSwatches_Helper_Productlist\\:\\:\\$_swatchAttributeFilteredValue \\(int\\) does not accept false\\.$#" + count: 1 + path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php + - message: "#^Variable \\$query might not be defined\\.$#" count: 2 path: ../app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:sessionUrlVar\\(\\)\\.$#" + message: "#^Return type \\(void\\) of method Mage_Contacts_IndexController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Controller_Front_Action\\)\\) of method Mage_Core_Controller_Front_Action\\:\\:preDispatch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Contacts/controllers/IndexController.php + + - + message: "#^Method Mage_Core_Block_Abstract\\:\\:_getUrlModel\\(\\) should return Mage_Core_Model_Url but returns Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Block/Abstract.php + + - + message: "#^Method Mage_Core_Block_Abstract\\:\\:getHelper\\(\\) should return \\$this\\(Mage_Core_Block_Abstract\\) but returns Mage_Core_Block_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Block/Abstract.php + + - + message: "#^Method Mage_Core_Block_Abstract\\:\\:getParentBlock\\(\\) should return \\$this\\(Mage_Core_Block_Abstract\\) but returns Mage_Core_Block_Abstract\\.$#" count: 1 path: ../app/code/core/Mage/Core/Block/Abstract.php - - message: "#^Static method Mage\\:\\:log\\(\\) invoked with 5 parameters, 1\\-4 required\\.$#" + message: "#^Return type \\(void\\) of method Mage_Core_Block_Template_Zend\\:\\:setScriptPath\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Template\\)\\) of method Mage_Core_Block_Template\\:\\:setScriptPath\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Core/Block/Template.php + path: ../app/code/core/Mage/Core/Block/Template/Zend.php - message: "#^Call to an undefined method Zend_Controller_Router_Interface\\:\\:addRoute\\(\\)\\.$#" @@ -2016,9 +2726,39 @@ parameters: path: ../app/code/core/Mage/Core/Controller/Varien/Action.php - - message: "#^Variable \\$action might not be defined\\.$#" - count: 2 - path: ../app/code/core/Mage/Core/Controller/Varien/Router/Standard.php + message: "#^Property Mage_Core_Controller_Varien_Action\\:\\:\\$_request \\(Mage_Core_Controller_Request_Http\\) does not accept Zend_Controller_Request_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Controller/Varien/Action.php + + - + message: "#^Property Mage_Core_Controller_Varien_Action\\:\\:\\$_response \\(Mage_Core_Controller_Response_Http\\) does not accept Zend_Controller_Response_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Controller/Varien/Action.php + + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Controller/Varien/Front.php + + - + message: "#^Method Mage_Core_Controller_Varien_Front\\:\\:_getRequestRewriteController\\(\\) should return Mage_Core_Model_Url_Rewrite_Request but returns bool\\|Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Controller/Varien/Front.php + + - + message: "#^Parameter \\#2 \\$useRouterName \\(bool\\) of method Mage_Core_Controller_Varien_Router_Admin\\:\\:collectRoutes\\(\\) should be compatible with parameter \\$useRouterName \\(string\\) of method Mage_Core_Controller_Varien_Router_Standard\\:\\:collectRoutes\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Core/Controller/Varien/Router/Admin.php + + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Controller/Varien/Router/Standard.php + + - + message: "#^Variable \\$action might not be defined\\.$#" + count: 2 + path: ../app/code/core/Mage/Core/Controller/Varien/Router/Standard.php - message: "#^Variable \\$controller might not be defined\\.$#" @@ -2035,11 +2775,56 @@ parameters: count: 2 path: ../app/code/core/Mage/Core/Controller/Varien/Router/Standard.php + - + message: "#^Method Mage_Core_Helper_Abstract\\:\\:_getRequest\\(\\) should return Mage_Core_Controller_Request_Http but returns Zend_Controller_Request_Http\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Helper/Abstract.php + + - + message: "#^Property Mage_Core_Helper_String\\:\\:\\$_arrayHelper \\(Mage_Core_Helper_Array\\) does not accept Mage_Core_Helper_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Helper/String.php + + - + message: "#^Property Mage_Core_Model_Abstract\\:\\:\\$_cacheTag \\(string\\|true\\) does not accept default value of type false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Abstract.php + + - + message: "#^Method Mage_Core_Model_App\\:\\:getDefaultStoreView\\(\\) should return Mage_Core_Model_Store but returns null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/App.php + + - + message: "#^Method Mage_Core_Model_App\\:\\:getResponse\\(\\) should return Mage_Core_Controller_Response_Http but returns Zend_Controller_Response_Http\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/App.php + + - + message: "#^Property Mage_Core_Model_App\\:\\:\\$_useSessionInUrl \\(bool\\) does not accept string\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/App.php + + - + message: "#^Property Mage_Core_Model_App\\:\\:\\$_website \\(Mage_Core_Model_Website\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/App.php + - message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" count: 1 path: ../app/code/core/Mage/Core/Model/App.php + - + message: "#^Method Mage_Core_Model_Cache\\:\\:getDbAdapter\\(\\) should return Zend_Db_Adapter_Abstract but returns Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Cache.php + + - + message: "#^Property Mage_Core_Model_Cache\\:\\:\\$_frontend \\(Varien_Cache_Core\\) does not accept Zend_Cache_Core\\|Zend_Cache_Frontend\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Cache.php + - message: "#^Call to an undefined method SimpleXMLElement\\:\\:getClassName\\(\\)\\.$#" count: 1 @@ -2055,15 +2840,45 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Config.php + - + message: "#^Method Mage_Core_Model_Config\\:\\:cleanCache\\(\\) should return \\$this\\(Mage_Core_Model_Config\\) but returns Mage_Core_Model_Config\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Config.php + + - + message: "#^Method Mage_Core_Model_Config\\:\\:getNodeClassInstance\\(\\) should return bool but returns object\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Config.php + + - + message: "#^Property Varien_Simplexml_Config\\:\\:\\$_cacheChecksum \\(unknown_type\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Config.php + + - + message: "#^Return type \\(Mage_Core_Model_App\\) of method Mage_Core_Model_Config\\:\\:_saveCache\\(\\) should be compatible with return type \\(bool\\) of method Varien_Simplexml_Config\\:\\:_saveCache\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Config.php + + - + message: "#^Return type \\(Zend_Cache_Core\\) of method Mage_Core_Model_Config\\:\\:getCache\\(\\) should be compatible with return type \\(Varien_Simplexml_Config_Cache_Abstract\\) of method Varien_Simplexml_Config\\:\\:getCache\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Config.php + + - + message: "#^Return type \\(string\\) of method Mage_Core_Model_Config\\:\\:_loadCache\\(\\) should be compatible with return type \\(bool\\) of method Varien_Simplexml_Config\\:\\:_loadCache\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Config.php + - message: "#^Variable \\$key might not be defined\\.$#" count: 1 path: ../app/code/core/Mage/Core/Model/Config.php - - message: "#^Method Mage_Core_Model_Config_Data\\:\\:afterLoad\\(\\) should return \\$this\\(Mage_Core_Model_Config_Data\\) but return statement is missing\\.$#" + message: "#^Method Mage_Core_Model_Cookie\\:\\:getHttponly\\(\\) should return bool but returns null\\.$#" count: 1 - path: ../app/code/core/Mage/Core/Model/Config/Data.php + path: ../app/code/core/Mage/Core/Model/Cookie.php - message: "#^Binary operation \"\\+\" between string and string results in an error\\.$#" @@ -2081,7 +2896,22 @@ parameters: path: ../app/code/core/Mage/Core/Model/Design.php - - message: "#^Binary operation \"\\.\" between non-falsy-string and array results in an error\\.$#" + message: "#^Property Varien_Simplexml_Config\\:\\:\\$_cacheChecksum \\(unknown_type\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Design/Config.php + + - + message: "#^Binary operation \"\\.\" between non\\-falsy\\-string and array results in an error\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Design/Package.php + + - + message: "#^Cannot assign offset 'layout'\\|'locale'\\|'skin'\\|'template' to string\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Design/Package.php + + - + message: "#^Cannot assign offset string to string\\.$#" count: 1 path: ../app/code/core/Mage/Core/Model/Design/Package.php @@ -2105,6 +2935,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Encryption.php + - + message: "#^Method Mage_Core_Model_Factory\\:\\:getUrlRewriteInstance\\(\\) should return Mage_Core_Model_Url_Rewrite but returns bool\\|Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Factory.php + - message: "#^Variable \\$parentId might not be defined\\.$#" count: 1 @@ -2125,6 +2960,26 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Layout.php + - + message: "#^Method Mage_Core_Model_Layout\\:\\:getMessagesBlock\\(\\) should return Mage_Core_Block_Messages but returns Mage_Core_Block_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Layout.php + + - + message: "#^Method Mage_Core_Model_Layout\\:\\:getMessagesBlock\\(\\) should return Mage_Core_Block_Messages but returns Mage_Core_Block_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Layout.php + + - + message: "#^Method Mage_Core_Model_Layout_Update\\:\\:saveCache\\(\\) should return bool but returns Mage_Core_Model_App\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Layout/Update.php + + - + message: "#^Property Mage_Core_Model_Locale\\:\\:\\$_locale \\(Zend_Locale\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Locale.php + - message: "#^Method Mage_Core_Model_Message_Collection\\:\\:getMessageByIdentifier\\(\\) should return Mage_Core_Model_Message_Abstract\\|null but return statement is missing\\.$#" count: 1 @@ -2140,6 +2995,26 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Resource.php + - + message: "#^Method Mage_Core_Model_Resource\\:\\:_getDefaultConnection\\(\\) should return string but returns Varien_Db_Adapter_Interface\\|false\\.$#" + count: 2 + path: ../app/code/core/Mage/Core/Model/Resource.php + + - + message: "#^Method Mage_Core_Model_Resource\\:\\:getConnection\\(\\) should return Varien_Db_Adapter_Interface\\|false but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource.php + + - + message: "#^Method Mage_Core_Model_Resource_Db_Abstract\\:\\:_getConnection\\(\\) should return Magento_Db_Adapter_Pdo_Mysql but returns Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Db/Abstract.php + + - + message: "#^Property Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:\\$_resource \\(Mage_Core_Model_Resource_Db_Abstract\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php + - message: "#^Variable \\$alias in isset\\(\\) always exists and is always null\\.$#" count: 1 @@ -2155,56 +3030,206 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php + - + message: "#^Method Mage_Core_Model_Resource_Entity_Abstract\\:\\:getConfig\\(\\) should return bool\\|string but returns Varien_Simplexml_Config\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php + + - + message: "#^Property Mage_Core_Model_Resource_Entity_Abstract\\:\\:\\$_config \\(Varien_Simplexml_Config\\) does not accept default value of type array\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php + + - + message: "#^Method Mage_Core_Model_Resource_File_Storage_Directory_Database\\:\\:getParentId\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php + + - + message: "#^Property Mage_Core_Model_Resource_File_Storage_File\\:\\:\\$filePointer \\(resource\\) does not accept null\\.$#" + count: 2 + path: ../app/code/core/Mage/Core/Model/Resource/File/Storage/File.php + - message: "#^PHPDoc tag @param for parameter \\$callbacks with type array\\|string is not subtype of native type array\\.$#" count: 1 path: ../app/code/core/Mage/Core/Model/Resource/Iterator.php + - + message: "#^Static property Mage_Core_Model_Resource_Resource\\:\\:\\$_dataVersions \\(array\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Resource.php + + - + message: "#^Property Mage_Core_Model_Resource_Session\\:\\:\\$_lifeTime \\(int\\) does not accept string\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Session.php + - message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:getClassName\\(\\)\\.$#" count: 2 path: ../app/code/core/Mage/Core/Model/Resource/Setup.php + - + message: "#^Property Mage_Core_Model_Resource_Setup\\:\\:\\$_conn \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Setup.php + + - + message: "#^Property Mage_Core_Model_Resource_Setup\\:\\:\\$_moduleConfig \\(Mage_Core_Model_Config_Element\\) does not accept SimpleXMLElement\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Setup.php + + - + message: "#^Property Mage_Core_Model_Resource_Setup\\:\\:\\$_resourceConfig \\(Mage_Core_Model_Config_Element\\) does not accept SimpleXMLElement\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Resource/Setup.php + - message: "#^Binary operation \"\\.\" between string and array results in an error\\.$#" count: 1 path: ../app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php + - + message: "#^Parameter \\#2 \\$clear \\(bool\\) of method Mage_Core_Model_Session_Abstract_Varien\\:\\:getData\\(\\) should be compatible with parameter \\$index \\(int\\|string\\) of method Varien_Object\\:\\:getData\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Session/Abstract/Varien.php + - message: "#^Access to an undefined property Zend_Session_Namespace\\:\\:\\$data\\.$#" count: 2 path: ../app/code/core/Mage/Core/Model/Session/Abstract/Zend.php + - + message: "#^Parameter \\#2 \\$clear \\(bool\\) of method Mage_Core_Model_Session_Abstract_Zend\\:\\:getData\\(\\) should be compatible with parameter \\$index \\(int\\|string\\) of method Varien_Object\\:\\:getData\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Session/Abstract/Zend.php + + - + message: "#^Method Mage_Core_Model_Store\\:\\:_getSession\\(\\) should return Mage_Core_Model_Session but returns Mage_Core_Model_Session_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Store.php + + - + message: "#^Method Mage_Core_Model_Store\\:\\:getPriceFilter\\(\\) should return Varien_Filter_Sprintf but returns Mage_Directory_Model_Currency_Filter\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Store.php + + - + message: "#^PHPDoc type bool of property Mage_Core_Model_Store\\:\\:\\$_cacheTag is not covariant with PHPDoc type string\\|true of overridden property Mage_Core_Model_Abstract\\:\\:\\$_cacheTag\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Store.php + + - + message: "#^Property Mage_Core_Model_Store\\:\\:\\$_priceFilter \\(Mage_Directory_Model_Currency_Filter\\) does not accept Varien_Filter_Sprintf\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Store.php + - message: "#^Variable \\$store might not be defined\\.$#" count: 8 path: ../app/code/core/Mage/Core/Model/Store/Api.php + - + message: "#^Property Mage_Core_Model_Template\\:\\:\\$_emulatedDesignConfig \\(Varien_Object\\) does not accept default value of type false\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Template.php + + - + message: "#^Property Mage_Core_Model_Template\\:\\:\\$_emulatedDesignConfig \\(Varien_Object\\) does not accept false\\.$#" + count: 2 + path: ../app/code/core/Mage/Core/Model/Template.php + + - + message: "#^Property Mage_Core_Model_Template\\:\\:\\$_initialEnvironmentInfo \\(Varien_Object\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Template.php + + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Translate.php + + - + message: "#^Method Mage_Core_Model_Url\\:\\:getRequest\\(\\) should return Mage_Core_Controller_Request_Http but returns Zend_Controller_Request_Http\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Url.php + + - + message: "#^PHPDoc type mixed of property Mage_Core_Model_Url_Rewrite\\:\\:\\$_cacheTag is not covariant with PHPDoc type string\\|true of overridden property Mage_Core_Model_Abstract\\:\\:\\$_cacheTag\\.$#" + count: 1 + path: ../app/code/core/Mage/Core/Model/Url/Rewrite.php + - message: "#^Variable \\$targetUrl might not be defined\\.$#" count: 3 path: ../app/code/core/Mage/Core/Model/Url/Rewrite.php - - message: "#^Function mageCoreErrorHandler\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Variable \\$arguments might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Core/functions.php + path: ../app/code/core/Mage/Cron/Model/Observer.php - - message: "#^Function mageDebugBacktrace\\(\\) should return string but return statement is missing\\.$#" + message: "#^Property Mage_CurrencySymbol_Model_System_Currencysymbol\\:\\:\\$_storeId \\(string\\|null\\) does not accept int\\|null\\.$#" count: 1 - path: ../app/code/core/Mage/Core/functions.php + path: ../app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php - - message: "#^Variable \\$arguments might not be defined\\.$#" + message: "#^Property Mage_CurrencySymbol_Model_System_Currencysymbol\\:\\:\\$_websiteId \\(string\\|null\\) does not accept int\\|null\\.$#" count: 1 - path: ../app/code/core/Mage/Cron/Model/Observer.php + path: ../app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php - message: "#^Call to an undefined method Mage_Wishlist_Model_Resource_Item_Collection\\:\\:addAttributeToSelect\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php + - + message: "#^Property Mage_Customer_Block_Account_Navigation\\:\\:\\$_activeLink \\(bool\\) does not accept string\\.$#" + count: 2 + path: ../app/code/core/Mage/Customer/Block/Account/Navigation.php + + - + message: "#^Method Mage_Customer_Block_Address_Edit\\:\\:getCountryId\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Block/Address/Edit.php + + - + message: "#^Return type \\(int\\) of method Mage_Customer_Block_Address_Edit\\:\\:getCountryId\\(\\) should be compatible with return type \\(string\\) of method Mage_Directory_Block_Data\\:\\:getCountryId\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Customer/Block/Address/Edit.php + + - + message: "#^Method Mage_Customer_Block_Form_Register\\:\\:getCountryId\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Block/Form/Register.php + + - + message: "#^Return type \\(int\\) of method Mage_Customer_Block_Form_Register\\:\\:getCountryId\\(\\) should be compatible with return type \\(string\\) of method Mage_Directory_Block_Data\\:\\:getCountryId\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Customer/Block/Form/Register.php + + - + message: "#^Method Mage_Customer_Block_Newsletter\\:\\:getAction\\(\\) should return Mage_Core_Controller_Varien_Action but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Block/Newsletter.php + + - + message: "#^Property Mage_Customer_Helper_Data\\:\\:\\$_groups \\(Mage_Customer_Model_Entity_Group_Collection\\) does not accept Mage_Customer_Model_Resource_Group_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Helper/Data.php + + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Model/Address/Abstract.php + + - + message: "#^Method Mage_Customer_Model_Address_Abstract\\:\\:getStreet\\(\\) should return string but returns array\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Model/Address/Abstract.php + - message: "#^Cannot access property \\$is_default_billing on array\\.$#" count: 2 @@ -2226,12 +3251,12 @@ parameters: path: ../app/code/core/Mage/Customer/Model/Api2/Customer/Address.php - - message: "#^Method Mage_Customer_Model_Api2_Customer_Rest_Customer_V1\\:\\:_retrieve\\(\\) should return array but return statement is missing\\.$#" + message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 - path: ../app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php + path: ../app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php - - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Property Mage_Customer_Model_Convert_Adapter_Customer\\:\\:\\$_customerModel \\(Mage_Customer_Model_Customer\\) does not accept string\\.$#" count: 1 path: ../app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -2246,27 +3271,37 @@ parameters: path: ../app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php - - message: "#^Method Mage_Customer_Model_Customer\\:\\:printError\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Method Mage_Directory_Model_Region\\:\\:loadByName\\(\\) invoked with 1 parameter, 2 required\\.$#" count: 1 path: ../app/code/core/Mage/Customer/Model/Customer.php - - message: "#^Method Mage_Directory_Model_Region\\:\\:loadByName\\(\\) invoked with 1 parameter, 2 required\\.$#" + message: "#^Property Mage_Customer_Model_Customer\\:\\:\\$_addresses \\(array\\\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Model/Customer.php + + - + message: "#^Property Mage_Customer_Model_Customer\\:\\:\\$_addressesCollection \\(Mage_Customer_Model_Entity_Address_Collection\\) does not accept Mage_Customer_Model_Resource_Address_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Customer/Model/Customer.php + + - + message: "#^Property Mage_Customer_Model_Customer\\:\\:\\$_addressesCollection \\(Mage_Customer_Model_Entity_Address_Collection\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Customer/Model/Customer.php - - message: "#^Method Mage_Customer_Model_Customer_Attribute_Backend_Password\\:\\:beforeSave\\(\\) should return \\$this\\(Mage_Customer_Model_Customer_Attribute_Backend_Password\\) but return statement is missing\\.$#" + message: "#^Property Mage_Customer_Model_Customer\\:\\:\\$_attributes \\(array\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php + path: ../app/code/core/Mage/Customer/Model/Customer.php - - message: "#^Call to an undefined method Varien_Object\\:\\:implodeStreetAddress\\(\\)\\.$#" + message: "#^Parameter \\#1 \\$data \\(stdClass\\) of method Mage_Customer_Model_Customer_Api_V2\\:\\:_prepareData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Customer_Model_Customer_Api\\:\\:_prepareData\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Street.php + path: ../app/code/core/Mage/Customer/Model/Customer/Api/V2.php - - message: "#^Call to an undefined method Varien_Object\\:\\:isConfirmationRequired\\(\\)\\.$#" + message: "#^Method Mage_Customer_Model_Resource_Customer\\:\\:getWebsiteId\\(\\) should return int but returns string\\.$#" count: 1 path: ../app/code/core/Mage/Customer/Model/Resource/Customer.php @@ -2286,22 +3321,27 @@ parameters: path: ../app/code/core/Mage/Customer/controllers/AccountController.php - - message: "#^Method Mage_Customer_AccountController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Customer_AccountController\\) but return statement is missing\\.$#" + message: "#^Method Mage_Customer_AccountController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Customer_AccountController\\) but empty return statement found\\.$#" count: 1 path: ../app/code/core/Mage/Customer/controllers/AccountController.php - - message: "#^Method Mage_Customer_AddressController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Customer_AddressController\\) but return statement is missing\\.$#" + message: "#^Variable \\$address might not be defined\\.$#" count: 1 path: ../app/code/core/Mage/Customer/controllers/AddressController.php - - message: "#^Variable \\$address might not be defined\\.$#" + message: "#^Method Mage_Dataflow_Model_Batch\\:\\:setParams\\(\\) should return Mage_Dataflow_Model_Batch_Abstract but returns \\$this\\(Mage_Dataflow_Model_Batch\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Customer/controllers/AddressController.php + path: ../app/code/core/Mage/Dataflow/Model/Batch.php + + - + message: "#^Property Mage_Dataflow_Model_Batch\\:\\:\\$_batchExport \\(Mage_Dataflow_Model_Batch_Export\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/Dataflow/Model/Batch.php - - message: "#^Method Mage_Dataflow_Model_Batch\\:\\:_afterDelete\\(\\) should return \\$this\\(Mage_Dataflow_Model_Batch\\) but return statement is missing\\.$#" + message: "#^Property Mage_Dataflow_Model_Batch\\:\\:\\$_batchImport \\(Mage_Dataflow_Model_Batch_Import\\) does not accept string\\.$#" count: 1 path: ../app/code/core/Mage/Dataflow/Model/Batch.php @@ -2335,6 +3375,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php + - + message: "#^Property Mage_Dataflow_Model_Convert_Action_Abstract\\:\\:\\$_container \\(Mage_Dataflow_Model_Convert_Container_Abstract\\) does not accept Mage_Dataflow_Model_Convert_Container_Interface\\.$#" + count: 1 + path: ../app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php + - message: "#^Undefined variable\\: \\$action$#" count: 1 @@ -2351,29 +3396,59 @@ parameters: path: ../app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php - - message: "#^Undefined variable\\: \\$profile$#" + message: "#^Property Mage_Dataflow_Model_Convert_Mapper_Column\\:\\:\\$_batchExport \\(Mage_Dataflow_Model_Batch_Export\\) does not accept string\\.$#" count: 1 - path: ../app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php + path: ../app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php - - message: "#^Method Mage_Dataflow_Model_Profile\\:\\:_afterSave\\(\\) should return \\$this\\(Mage_Dataflow_Model_Profile\\) but return statement is missing\\.$#" + message: "#^Property Mage_Dataflow_Model_Convert_Mapper_Column\\:\\:\\$_batchImport \\(Mage_Dataflow_Model_Batch_Import\\) does not accept string\\.$#" count: 1 - path: ../app/code/core/Mage/Dataflow/Model/Profile.php + path: ../app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php - - message: "#^Variable \\$parseFileXml might not be defined\\.$#" + message: "#^Property Mage_Dataflow_Model_Convert_Parser_Abstract\\:\\:\\$_batchExport \\(Mage_Dataflow_Model_Batch_Export\\) does not accept string\\.$#" count: 1 - path: ../app/code/core/Mage/Dataflow/Model/Profile.php + path: ../app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php - - message: "#^Variable \\$path might not be defined\\.$#" - count: 2 + message: "#^Property Mage_Dataflow_Model_Convert_Parser_Abstract\\:\\:\\$_batchImport \\(Mage_Dataflow_Model_Batch_Import\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php + + - + message: "#^Argument of an invalid type string\\|false supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php + + - + message: "#^Method Mage_Dataflow_Model_Convert_Profile_Abstract\\:\\:run\\(\\) should return Mage_Dataflow_Model_Convert_Profile_Abstract but empty return statement found\\.$#" + count: 2 + path: ../app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php + + - + message: "#^Undefined variable\\: \\$profile$#" + count: 1 + path: ../app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php + + - + message: "#^Variable \\$parseFileXml might not be defined\\.$#" + count: 1 + path: ../app/code/core/Mage/Dataflow/Model/Profile.php + + - + message: "#^Variable \\$path might not be defined\\.$#" + count: 2 path: ../app/code/core/Mage/Dataflow/Model/Profile.php - - message: "#^Binary operation \"\\*\" between float and non-falsy-string results in an error\\.$#" + message: "#^Property Mage_Directory_Helper_Data\\:\\:\\$_countryCollection \\(Mage_Directory_Model_Resource_Country_Collection\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Directory/Helper/Data.php + + - + message: "#^Method Mage_Directory_Model_Country\\:\\:getFormat\\(\\) should return Mage_Directory_Model_Country_Format but returns null\\.$#" count: 1 - path: ../app/code/core/Mage/Directory/Model/Currency.php + path: ../app/code/core/Mage/Directory/Model/Country.php - message: "#^Variable \\$response might not be defined\\.$#" @@ -2396,139 +3471,149 @@ parameters: path: ../app/code/core/Mage/Directory/Model/Resource/Country/Collection.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinks\\(\\)\\.$#" + message: "#^Property Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Links\\:\\:\\$_purchasedSeparatelyAttribute \\(Mage_Catalog_Model_Resource_Eav_Attribute\\) does not accept Mage_Eav_Model_Entity_Attribute\\.$#" count: 1 path: ../app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSamples\\(\\)\\.$#" + message: "#^Cannot call method streamRead\\(\\) on resource\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php + path: ../app/code/core/Mage/Downloadable/Helper/Download.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinkSelectionRequired\\(\\)\\.$#" + message: "#^Cannot call method streamStat\\(\\) on resource\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php + path: ../app/code/core/Mage/Downloadable/Helper/Download.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinks\\(\\)\\.$#" + message: "#^Property Mage_Downloadable_Helper_Download\\:\\:\\$_handle \\(resource\\) does not accept Varien_Io_File\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php + path: ../app/code/core/Mage/Downloadable/Helper/Download.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:hasLinks\\(\\)\\.$#" + message: "#^Cannot access offset 'file' on bool\\|void\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php + path: ../app/code/core/Mage/Downloadable/Model/Link/Api.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSamples\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php + message: "#^Offset 'file' does not exist on array\\{status\\: 'new'\\}\\.$#" + count: 2 + path: ../app/code/core/Mage/Downloadable/Model/Link/Api.php + + - + message: "#^Variable \\$downloadableModel might not be defined\\.$#" + count: 3 + path: ../app/code/core/Mage/Downloadable/Model/Link/Api.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:hasSamples\\(\\)\\.$#" + message: "#^Property Varien_File_Uploader\\:\\:\\$_uploadType \\(string\\) does not accept int\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php + path: ../app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinks\\(\\)\\.$#" + message: "#^Parameter \\#2 \\$resource \\(object\\) of method Mage_Downloadable_Model_Link_Api_V2\\:\\:add\\(\\) should be compatible with parameter \\$resource \\(array\\) of method Mage_Downloadable_Model_Link_Api\\:\\:add\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php + path: ../app/code/core/Mage/Downloadable/Model/Link/Api/V2.php - - message: "#^Cannot call method streamRead\\(\\) on resource\\.$#" + message: "#^Cannot access offset 'tmp_name' on bool\\|void\\.$#" + count: 2 + path: ../app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php + + - + message: "#^Method Mage_Customer_Model_Session\\:\\:setBeforeAuthUrl\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Helper/Download.php + path: ../app/code/core/Mage/Downloadable/controllers/DownloadController.php - - message: "#^Cannot call method streamStat\\(\\) on resource\\.$#" + message: "#^Return type \\(void\\) of method Mage_Downloadable_FileController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Controller_Action\\)\\) of method Mage_Adminhtml_Controller_Action\\:\\:preDispatch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Helper/Download.php + path: ../app/code/core/Mage/Downloadable/controllers/FileController.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinks\\(\\)\\.$#" + message: "#^Return type \\(void\\) of method Mage_Downloadable_Product_EditController\\:\\:preDispatch\\(\\) should be compatible with return type \\(Mage_Adminhtml_Controller_Action\\) of method Mage_Adminhtml_Catalog_ProductController\\:\\:preDispatch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Model/Link/Api.php + path: ../app/code/core/Mage/Downloadable/controllers/Product/EditController.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSamples\\(\\)\\.$#" + message: "#^Property Zend_Validate_InArray\\:\\:\\$_messageTemplates \\(array\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Model/Link/Api.php + path: ../app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php - - message: "#^Variable \\$downloadableModel might not be defined\\.$#" - count: 3 - path: ../app/code/core/Mage/Downloadable/Model/Link/Api.php + message: "#^Call to an undefined method Mage_Eav_Model_Resource_Entity_Attribute\\:\\:getUsedInForms\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Attribute.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinks\\(\\)\\.$#" + message: "#^Method Mage_Eav_Model_Attribute_Data_Abstract\\:\\:setRequestScope\\(\\) should return string but returns \\$this\\(Mage_Eav_Model_Attribute_Data_Abstract\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Model/Observer.php + path: ../app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getLinks\\(\\)\\.$#" + message: "#^Property Mage_Eav_Model_Attribute_Data_Abstract\\:\\:\\$_attribite \\(Mage_Eav_Model_Attribute\\) does not accept Mage_Eav_Model_Entity_Attribute_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Model/Product/Price.php + path: ../app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php - - message: "#^Method Mage_Downloadable_Model_Product_Type\\:\\:beforeSave\\(\\) should return Mage_Catalog_Model_Product_Type_Abstract but return statement is missing\\.$#" + message: "#^Property Mage_Eav_Model_Attribute_Data_Abstract\\:\\:\\$_dateFilterFormat \\(string\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/Model/Product/Type.php + path: ../app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php - - message: "#^Method Mage_Downloadable_CustomerController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Downloadable_CustomerController\\) but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:getEntityTypeCode\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/controllers/CustomerController.php + path: ../app/code/core/Mage/Eav/Model/Attribute/Data/File.php - - message: "#^Method Mage_Customer_Model_Session\\:\\:setBeforeAuthUrl\\(\\) invoked with 2 parameters, 1 required\\.$#" + message: "#^Call to an undefined method Mage_Core_Model_Resource_Abstract\\:\\:getDefaultAttributes\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/controllers/DownloadController.php + path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Method Mage_Downloadable_FileController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Downloadable_FileController\\) but return statement is missing\\.$#" + message: "#^Cannot call method loadByCode\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/controllers/FileController.php + path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Method Mage_Downloadable_Product_EditController\\:\\:preDispatch\\(\\) should return Mage_Adminhtml_Controller_Action but return statement is missing\\.$#" + message: "#^Method Mage_Eav_Model_Config\\:\\:getAttribute\\(\\) should return Mage_Eav_Model_Entity_Attribute_Abstract\\|false but returns Mage_Eav_Model_Entity_Attribute_Interface\\.$#" count: 1 - path: ../app/code/core/Mage/Downloadable/controllers/Product/EditController.php + path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Call to an undefined method Mage_Eav_Model_Resource_Entity_Attribute\\:\\:getUsedInForms\\(\\)\\.$#" + message: "#^Property Mage_Eav_Model_Config\\:\\:\\$_attributeData \\(array\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Eav/Model/Attribute.php + path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:getEntityTypeCode\\(\\)\\.$#" + message: "#^Property Mage_Eav_Model_Config\\:\\:\\$_entityData \\(array\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Eav/Model/Attribute/Data/File.php + path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Abstract\\:\\:getDefaultAttributes\\(\\)\\.$#" + message: "#^Property Mage_Eav_Model_Config\\:\\:\\$_objects \\(array\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Cannot call method loadByCode\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#" + message: "#^Property Mage_Eav_Model_Config\\:\\:\\$_references \\(array\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Eav/Model/Config.php - - message: "#^Variable \\$defBind might not be defined\\.$#" + message: "#^Method Mage_Eav_Model_Convert_Adapter_Entity\\:\\:_getCollectionForLoad\\(\\) should return Mage_Eav_Model_Entity_Collection but returns Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 path: ../app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php - - message: "#^Variable \\$entityIds might not be defined\\.$#" + message: "#^Variable \\$defBind might not be defined\\.$#" count: 1 path: ../app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php - - message: "#^Access to an undefined property Mage_Eav_Model_Convert_Adapter_Grid\\:\\:\\$_entityType\\.$#" + message: "#^Variable \\$entityIds might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php + path: ../app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php - message: "#^Binary operation \"\\.\" between Mage_Eav_Model_Entity_Interface and '_collection' results in an error\\.$#" @@ -2555,6 +3640,36 @@ parameters: count: 1 path: ../app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php + - + message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:_getReadAdapter\\(\\) should return Magento_Db_Adapter_Pdo_Mysql but returns Varien_Db_Adapter_Pdo_Mysql\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php + + - + message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:_getWriteAdapter\\(\\) should return Magento_Db_Adapter_Pdo_Mysql but returns Varien_Db_Adapter_Pdo_Mysql\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php + + - + message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php + + - + message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php + + - + message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php + + - + message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Abstract.php + - message: "#^Variable \\$attributeCode might not be defined\\.$#" count: 1 @@ -2585,6 +3700,21 @@ parameters: count: 1 path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php + - + message: "#^Method Mage_Eav_Model_Entity_Attribute_Abstract\\:\\:getFlatUpdateSelect\\(\\) should return \\$this\\(Mage_Eav_Model_Entity_Attribute_Abstract\\)\\|Varien_Db_Select but returns null\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php + + - + message: "#^Property Mage_Eav_Model_Entity_Attribute_Abstract\\:\\:\\$_entity \\(Mage_Eav_Model_Entity_Abstract\\) does not accept Mage_Eav_Model_Entity_Type\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php + + - + message: "#^Return type \\(\\$this\\(Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\)\\) of method Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\:\\:setValueId\\(\\) should be compatible with return type \\(int\\) of method Mage_Eav_Model_Entity_Attribute_Backend_Interface\\:\\:setValueId\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php + - message: "#^Variable \\$out in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -2630,6 +3760,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php + - + message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php + - message: "#^Binary operation \"\\+\" between string and 1 results in an error\\.$#" count: 3 @@ -2645,16 +3780,46 @@ parameters: count: 1 path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php + - + message: "#^Method Mage_Eav_Model_Entity_Setup\\:\\:getDefaultAttributeGroupId\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php + + - + message: "#^Method Mage_Eav_Model_Entity_Setup\\:\\:getDefaultAttributeSetId\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php + - message: "#^Variable \\$connection might not be defined\\.$#" count: 2 path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php + - + message: "#^Method Mage_Eav_Model_Resource_Entity_Attribute\\:\\:_getMaxSortOrder\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php + + - + message: "#^Method Mage_Eav_Model_Resource_Entity_Attribute\\:\\:getIdByCode\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php + + - + message: "#^Method Mage_Eav_Model_Resource_Entity_Attribute_Group\\:\\:_getMaxSortOrder\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php + - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Collection_Abstract\\:\\:getStoreId\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php + - + message: "#^Method Mage_Eav_Model_Resource_Entity_Attribute_Set\\:\\:getDefaultGroupId\\(\\) should return int\\|null but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set.php + - message: "#^Variable \\$store might not be defined\\.$#" count: 2 @@ -2666,14 +3831,19 @@ parameters: path: ../app/code/core/Mage/Eav/Model/Resource/Form/Type.php - - message: "#^Method Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\:\\:afterLoad\\(\\) should return \\$this\\(Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\) but return statement is missing\\.$#" + message: "#^Method Mage_GiftMessage_Model_Api_V2\\:\\:_prepareData\\(\\) should return array but returns mixed\\.$#" + count: 1 + path: ../app/code/core/Mage/GiftMessage/Model/Api/V2.php + + - + message: "#^Return type \\(stdClass\\) of method Mage_GiftMessage_Model_Api_V2\\:\\:_setGiftMessage\\(\\) should be compatible with return type \\(array\\) of method Mage_GiftMessage_Model_Api\\:\\:_setGiftMessage\\(\\)$#" count: 1 - path: ../app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php + path: ../app/code/core/Mage/GiftMessage/Model/Api/V2.php - - message: "#^Method Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\:\\:beforeSave\\(\\) should return \\$this\\(Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\) but return statement is missing\\.$#" + message: "#^Method Mage_GiftMessage_Model_Message\\:\\:getEntityModelByType\\(\\) should return Mage_Eav_Model_Entity_Abstract but returns Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php + path: ../app/code/core/Mage/GiftMessage/Model/Message.php - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setGiftMessageId\\(\\)\\.$#" @@ -2690,16 +3860,86 @@ parameters: count: 1 path: ../app/code/core/Mage/GiftMessage/controllers/IndexController.php + - + message: "#^Method Mage_GoogleAnalytics_Block_Ga\\:\\:_getOrdersTrackingCodeAnalytics\\(\\) should return string but empty return statement found\\.$#" + count: 1 + path: ../app/code/core/Mage/GoogleAnalytics/Block/Ga.php + + - + message: "#^Method Mage_GoogleAnalytics_Block_Ga\\:\\:_getOrdersTrackingCodeUniversal\\(\\) should return string but empty return statement found\\.$#" + count: 1 + path: ../app/code/core/Mage/GoogleAnalytics/Block/Ga.php + + - + message: "#^Method Mage_GoogleAnalytics_Helper_Data\\:\\:isUseUniversalAnalytics\\(\\) should return string but returns bool\\.$#" + count: 1 + path: ../app/code/core/Mage/GoogleAnalytics/Helper/Data.php + + - + message: "#^Return type \\(void\\) of method Mage_GoogleCheckout_Model_Payment\\:\\:authorize\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:authorize\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/GoogleCheckout/Model/Payment.php + + - + message: "#^Return type \\(void\\) of method Mage_GoogleCheckout_Model_Payment\\:\\:cancel\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:cancel\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/GoogleCheckout/Model/Payment.php + + - + message: "#^Return type \\(void\\) of method Mage_GoogleCheckout_Model_Payment\\:\\:capture\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:capture\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/GoogleCheckout/Model/Payment.php + + - + message: "#^Return type \\(void\\) of method Mage_GoogleCheckout_Model_Payment\\:\\:refund\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:refund\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/GoogleCheckout/Model/Payment.php + + - + message: "#^Return type \\(void\\) of method Mage_GoogleCheckout_Model_Payment\\:\\:void\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:void\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/GoogleCheckout/Model/Payment.php + - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 4 path: ../app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php + - + message: "#^Return type \\(false\\) of method Mage_ImportExport_Block_Adminhtml_Export_Filter\\:\\:getRowUrl\\(\\) should be compatible with return type \\(string\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:getRowUrl\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php + + - + message: "#^Method Mage_ImportExport_Helper_Data\\:\\:getMaxUploadSize\\(\\) should return int but returns string\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Helper/Data.php + + - + message: "#^Property Mage_ImportExport_Model_Export\\:\\:\\$_entityAdapter \\(Mage_ImportExport_Model_Export_Entity_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Export.php + + - + message: "#^Property Mage_ImportExport_Model_Export\\:\\:\\$_writer \\(Mage_ImportExport_Model_Export_Adapter_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Export.php + - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php + - + message: "#^Property Mage_ImportExport_Model_Export_Entity_Abstract\\:\\:\\$_connection \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php + + - + message: "#^Property Mage_ImportExport_Model_Export_Entity_Abstract\\:\\:\\$_entityTypeId \\(int\\) does not accept string\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php + - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getFrontendInput\\(\\)\\.$#" count: 1 @@ -2730,11 +3970,41 @@ parameters: count: 1 path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php + - + message: "#^Cannot access offset 'file' on bool\\|void\\.$#" + count: 2 + path: ../app/code/core/Mage/ImportExport/Model/Import.php + + - + message: "#^Cannot access offset 'path' on bool\\|void\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import.php + + - + message: "#^Property Mage_ImportExport_Model_Import\\:\\:\\$_entityAdapter \\(Mage_ImportExport_Model_Import_Entity_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import.php + + - + message: "#^Static property Mage_ImportExport_Model_Import\\:\\:\\$_entityInvalidatedIndexes \\(Mage_ImportExport_Model_Import_Entity_Abstract\\) does not accept default value of type array\\\\>\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import.php + - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php + - + message: "#^Property Mage_ImportExport_Model_Import_Entity_Abstract\\:\\:\\$_connection \\(Varien_Convert_Adapter_Interface\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php + + - + message: "#^Property Mage_ImportExport_Model_Import_Entity_Abstract\\:\\:\\$_entityTypeId \\(int\\) does not accept string\\|null\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php + - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getBackend\\(\\)\\.$#" count: 3 @@ -2825,6 +4095,16 @@ parameters: count: 2 path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php + - + message: "#^Method Mage_ImportExport_Model_Import_Entity_Product\\:\\:getConnection\\(\\) should return Varien_Db_Adapter_Pdo_Mysql but returns Varien_Convert_Adapter_Interface\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php + + - + message: "#^Property Mage_ImportExport_Model_Import_Entity_Product\\:\\:\\$_urlKeyAttributeId \\(int\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php + - message: "#^Variable \\$prevOptionId might not be defined\\.$#" count: 4 @@ -2856,430 +4136,434 @@ parameters: path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php - - message: "#^Method Mage_Index_Block_Adminhtml_Process_Edit\\:\\:getHeaderText\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php + message: "#^Cannot access offset 'name' on bool\\|void\\.$#" + count: 2 + path: ../app/code/core/Mage/ImportExport/Model/Import/Uploader.php - - message: "#^Method Mage_Core_Model_Resource\\:\\:getConnection\\(\\) invoked with 2 parameters, 1 required\\.$#" + message: "#^Property Varien_File_Uploader\\:\\:\\$_uploadType \\(string\\) does not accept int\\.$#" count: 1 - path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php + path: ../app/code/core/Mage/ImportExport/Model/Import/Uploader.php - - message: "#^Method Mage_Index_Model_Resource_Setup\\:\\:_syncIndexes\\(\\) should return \\$this\\(Mage_Index_Model_Resource_Setup\\) but return statement is missing\\.$#" + message: "#^Property Mage_ImportExport_Model_Resource_Import_Data\\:\\:\\$_iterator \\(IteratorIterator\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Index/Model/Resource/Setup.php + path: ../app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php - - message: "#^Call to an undefined method Varien_Object\\:\\:addError\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Install/Model/Installer.php + message: "#^Method Mage_Index_Model_Lock\\:\\:getInstance\\(\\) should return \\$this\\(Mage_Index_Model_Lock\\) but returns Mage_Index_Model_Lock\\.$#" + count: 1 + path: ../app/code/core/Mage/Index/Model/Lock.php - - message: "#^Constant data not found\\.$#" + message: "#^Property Mage_Index_Model_Lock\\:\\:\\$_storage \\(Mage_Index_Model_Lock_Storage_Interface\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Install/Model/Installer.php + path: ../app/code/core/Mage/Index/Model/Lock.php - - message: "#^Call to an undefined method Varien_Object\\:\\:addError\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Install/Model/Installer/Config.php + message: "#^Method Mage_Core_Model_Resource\\:\\:getConnection\\(\\) invoked with 2 parameters, 1 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php - - message: "#^Call to an undefined method Mage_Install_Model_Installer_Db_Abstract\\:\\:getVersion\\(\\)\\.$#" + message: "#^Method Mage_Index_Model_Lock_Storage_Db\\:\\:releaseLock\\(\\) should return int\\|null but returns bool\\.$#" count: 1 - path: ../app/code/core/Mage/Install/Model/Installer/Db.php - + path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php - - message: "#^Call to an undefined method Varien_Object\\:\\:addError\\(\\)\\.$#" + message: "#^Property Mage_Index_Model_Lock_Storage_Db\\:\\:\\$_helper \\(Mage_Index_Model_Resource_Helper_Mysql4\\) does not accept Mage_Core_Model_Resource_Helper_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Install/Model/Installer/Filesystem.php + path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php - - message: "#^Result of method Mage_Core_Controller_Varien_Action\\:\\:preDispatch\\(\\) \\(void\\) is used\\.$#" + message: "#^Return type \\(int\\|null\\) of method Mage_Index_Model_Lock_Storage_Db\\:\\:releaseLock\\(\\) should be compatible with return type \\(bool\\) of method Mage_Index_Model_Lock_Storage_Interface\\:\\:releaseLock\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Install/controllers/IndexController.php + path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php - - message: "#^Result of method Mage_Core_Controller_Varien_Action\\:\\:preDispatch\\(\\) \\(void\\) is used\\.$#" + message: "#^Property Varien_Data_Collection\\:\\:\\$_totalRecords \\(int\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Install/controllers/WizardController.php + path: ../app/code/core/Mage/Index/Model/Resource/Event/Collection.php - - message: "#^Binary operation \"\\+\" between non-falsy-string and 1 results in an error\\.$#" - count: 2 - path: ../app/code/core/Mage/Log/Model/Resource/Log.php + message: "#^Property Varien_Data_Collection_Db\\:\\:\\$_data \\(array\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Index/Model/Resource/Event/Collection.php - - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeId\\(\\)\\.$#" - count: 3 - path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php + message: "#^Return type \\(Varien_Db_Adapter_Interface\\|false\\) of method Mage_Index_Model_Resource_Lock_Resource\\:\\:_getDefaultConnection\\(\\) should be compatible with return type \\(string\\) of method Mage_Core_Model_Resource\\:\\:_getDefaultConnection\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Index/Model/Resource/Lock/Resource.php - - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getBackend\\(\\)\\.$#" - count: 3 - path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php + message: "#^Method Mage_Index_Model_Resource_Setup\\:\\:_syncIndexes\\(\\) should return \\$this\\(Mage_Index_Model_Resource_Setup\\) but return statement is missing\\.$#" + count: 1 + path: ../app/code/core/Mage/Index/Model/Resource/Setup.php - - message: "#^Method Mage_Newsletter_ManageController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Newsletter_ManageController\\) but return statement is missing\\.$#" + message: "#^Return type \\(void\\) of method Mage_Index_Model_Resource_Setup\\:\\:applyUpdates\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Resource_Setup\\)\\|true\\) of method Mage_Core_Model_Resource_Setup\\:\\:applyUpdates\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Newsletter/controllers/ManageController.php + path: ../app/code/core/Mage/Index/Model/Resource/Setup.php - - message: "#^Method Mage_Newsletter_ManageController\\:\\:saveAction\\(\\) should return Mage_Newsletter_ManageController but return statement is missing\\.$#" + message: "#^Offset 'path' does not exist on array\\{\\000\\*\\000_parent\\: Varien_Simplexml_Element\\}\\.$#" count: 1 - path: ../app/code/core/Mage/Newsletter/controllers/ManageController.php + path: ../app/code/core/Mage/Install/Model/Config.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:authenticate\\(\\)\\.$#" + message: "#^Constant data not found\\.$#" count: 1 - path: ../app/code/core/Mage/Oauth/controllers/Customer/TokenController.php + path: ../app/code/core/Mage/Install/Model/Installer.php - - message: "#^Method Mage_Oauth_Customer_TokenController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Oauth_Customer_TokenController\\) but return statement is missing\\.$#" + message: "#^Property Mage_Install_Model_Installer\\:\\:\\$_dataModel \\(Mage_Install_Model_Session\\) does not accept Varien_Object\\.$#" count: 1 - path: ../app/code/core/Mage/Oauth/controllers/Customer/TokenController.php + path: ../app/code/core/Mage/Install/Model/Installer.php - - message: "#^Variable \\$finish might not be defined\\.$#" + message: "#^Call to an undefined method Mage_Install_Model_Installer_Db_Abstract\\:\\:getVersion\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Page/Block/Html/Pager.php + path: ../app/code/core/Mage/Install/Model/Installer/Db.php - - message: "#^Variable \\$start might not be defined\\.$#" + message: "#^Method Mage_Install_Model_Installer_Db\\:\\:_getDbResource\\(\\) should return Mage_Install_Model_Installer_Db_Abstract but returns resource\\.$#" count: 1 - path: ../app/code/core/Mage/Page/Block/Html/Pager.php + path: ../app/code/core/Mage/Install/Model/Installer/Db.php - - message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:isPartialAuthorization\\(\\)\\.$#" + message: "#^Property Mage_Install_Model_Installer_Db\\:\\:\\$_dbResource \\(resource\\) does not accept Mage_Core_Model_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php + path: ../app/code/core/Mage/Install/Model/Installer/Db.php - - message: "#^Default value of the parameter \\#5 \\$amount \\(false\\) of method Mage_Paygate_Helper_Data\\:\\:getExtendedTransactionMessage\\(\\) is incompatible with type float\\.$#" + message: "#^Method Mage_Install_IndexController\\:\\:preDispatch\\(\\) with return type void returns void but should not return anything\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Helper/Data.php + path: ../app/code/core/Mage/Install/controllers/IndexController.php - - message: "#^Default value of the parameter \\#5 \\$amount \\(false\\) of method Mage_Paygate_Helper_Data\\:\\:getTransactionMessage\\(\\) is incompatible with type float\\.$#" + message: "#^Result of method Mage_Core_Controller_Varien_Action\\:\\:preDispatch\\(\\) \\(void\\) is used\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Helper/Data.php + path: ../app/code/core/Mage/Install/controllers/IndexController.php - - message: "#^Default value of the parameter \\#6 \\$exception \\(false\\) of method Mage_Paygate_Helper_Data\\:\\:getExtendedTransactionMessage\\(\\) is incompatible with type string\\.$#" + message: "#^Method Mage_Install_WizardController\\:\\:preDispatch\\(\\) with return type void returns void but should not return anything\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Helper/Data.php + path: ../app/code/core/Mage/Install/controllers/WizardController.php - - message: "#^Default value of the parameter \\#6 \\$exception \\(false\\) of method Mage_Paygate_Helper_Data\\:\\:getTransactionMessage\\(\\) is incompatible with type string\\.$#" + message: "#^Result of method Mage_Core_Controller_Varien_Action\\:\\:preDispatch\\(\\) \\(void\\) is used\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Helper/Data.php + path: ../app/code/core/Mage/Install/controllers/WizardController.php - - message: "#^Default value of the parameter \\#7 \\$additionalMessage \\(false\\) of method Mage_Paygate_Helper_Data\\:\\:getExtendedTransactionMessage\\(\\) is incompatible with type string\\.$#" + message: "#^Property Mage_Log_Model_Aggregation\\:\\:\\$_lastRecord \\(string\\) does not accept int\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Helper/Data.php + path: ../app/code/core/Mage/Log/Model/Aggregation.php - - message: "#^Access to an undefined property Mage_Paygate_Model_Authorizenet\\:\\:\\$_cardsStorage\\.$#" + message: "#^Binary operation \"\\+\" between non\\-falsy\\-string and 1 results in an error\\.$#" count: 2 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php + path: ../app/code/core/Mage/Log/Model/Resource/Log.php - - message: "#^Variable \\$defaultExceptionMessage might not be defined\\.$#" - count: 2 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php + message: "#^Method Mage_Media_Model_File_Image\\:\\:getImage\\(\\) should return bool\\|resource but returns GdImage\\.$#" + count: 1 + path: ../app/code/core/Mage/Media/Model/File/Image.php - - message: "#^Variable \\$newTransactionType might not be defined\\.$#" - count: 3 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php + message: "#^Method Mage_Media_Model_File_Image\\:\\:getTmpImage\\(\\) should return resource but returns GdImage\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Media/Model/File/Image.php - - message: "#^Method Mage_Paygate_Model_Authorizenet_Cards\\:\\:flushCards\\(\\) has invalid return type Mage_Paygate_Model_Authorizenet_Cart\\.$#" + message: "#^Property Mage_Media_Model_Image\\:\\:\\$_image \\(resource\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php + path: ../app/code/core/Mage/Media/Model/Image.php - - message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:cancelPartialAuthorization\\(\\)\\.$#" + message: "#^Property Mage_Media_Model_Image\\:\\:\\$_tmpImage \\(resource\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php + path: ../app/code/core/Mage/Media/Model/Image.php - - message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:cancelPartialAuthorization\\(\\)\\.$#" + message: "#^Method Mage_Newsletter_Model_Problem\\:\\:getSubscriber\\(\\) should return Mage_Newsletter_Model_Subscriber but returns null\\.$#" count: 1 - path: ../app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php + path: ../app/code/core/Mage/Newsletter/Model/Problem.php - - message: "#^Method Mage_Payment_Block_Catalog_Product_View_Profile\\:\\:getDateHtml\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php + message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeId\\(\\)\\.$#" + count: 3 + path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isAvailable\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Payment/Helper/Data.php + message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getBackend\\(\\)\\.$#" + count: 3 + path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php - - message: "#^Comparison operation \"\\<\" between \\(array\\|float\\|int\\) and 0\\.0001 results in an error\\.$#" + message: "#^Property Mage_Newsletter_Model_Template\\:\\:\\$_mail \\(Zend_Mail\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Payment/Model/Method/Abstract.php + path: ../app/code/core/Mage/Newsletter/Model/Template.php - - message: "#^Binary operation \"\\*\\=\" between string and 2 results in an error\\.$#" + message: "#^Method Mage_Newsletter_ManageController\\:\\:saveAction\\(\\) should return Mage_Newsletter_ManageController but return statement is missing\\.$#" count: 1 - path: ../app/code/core/Mage/Payment/Model/Method/Cc.php + path: ../app/code/core/Mage/Newsletter/controllers/ManageController.php - - message: "#^Method Mage_Payment_Model_Method_Cc\\:\\:_isPlaceOrder\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Return type \\(void\\) of method Mage_Oauth_Adminhtml_Oauth_AuthorizeController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Adminhtml_Controller_Action\\)\\) of method Mage_Adminhtml_Controller_Action\\:\\:preDispatch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Payment/Model/Method/Cc.php + path: ../app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php - - message: "#^Method Mage_Payment_Model_Recurring_Profile\\:\\:getFieldComment\\(\\) should return string\\|null but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:authenticate\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Payment/Model/Recurring/Profile.php + path: ../app/code/core/Mage/Oauth/controllers/Customer/TokenController.php - - message: "#^Method Mage_Payment_Model_Recurring_Profile\\:\\:getFieldLabel\\(\\) should return string\\|null but return statement is missing\\.$#" + message: "#^Property Mage_Oauth_Customer_TokenController\\:\\:\\$_session \\(Mage_Customer_Model_Session\\) does not accept Mage_Core_Model_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Payment/Model/Recurring/Profile.php + path: ../app/code/core/Mage/Oauth/controllers/Customer/TokenController.php - - message: "#^Method Mage_Paypal_Block_Adminhtml_System_Config_Payflowlink_Info\\:\\:getFrontendUrl\\(\\) has invalid return type strting\\.$#" + message: "#^Property Mage_Oauth_Customer_TokenController\\:\\:\\$_sessionName \\(Mage_Customer_Model_Session\\) does not accept default value of type string\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php + path: ../app/code/core/Mage/Oauth/controllers/Customer/TokenController.php - - message: "#^Access to an undefined property Mage_Paypal_Block_Express_Review\\:\\:\\$_address\\.$#" - count: 2 - path: ../app/code/core/Mage/Paypal/Block/Express/Review.php + message: "#^Return type \\(void\\) of method Mage_Oauth_InitiateController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Controller_Front_Action\\)\\) of method Mage_Core_Controller_Front_Action\\:\\:preDispatch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Oauth/controllers/InitiateController.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$visible_on_cart\\.$#" + message: "#^Return type \\(void\\) of method Mage_Oauth_TokenController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Controller_Front_Action\\)\\) of method Mage_Core_Controller_Front_Action\\:\\:preDispatch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Paypal/Block/Express/Shortcut.php + path: ../app/code/core/Mage/Oauth/controllers/TokenController.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$visible_on_product\\.$#" + message: "#^Variable \\$finish might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Block/Express/Shortcut.php + path: ../app/code/core/Mage/Page/Block/Html/Pager.php - - message: "#^Method Mage_Paypal_Block_Payment_Info\\:\\:getCcTypeName\\(\\) should return string\\|null but return statement is missing\\.$#" + message: "#^Variable \\$start might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Block/Payment/Info.php + path: ../app/code/core/Mage/Page/Block/Html/Pager.php - - message: "#^Access to an undefined property Mage_Paypal_Controller_Express_Abstract\\:\\:\\$_checkoutType\\.$#" + message: "#^Method Mage_PageCache_Helper_Data\\:\\:getCacheControlInstance\\(\\) should return Mage_PageCache_Model_Control_Interface but returns Mage_Core_Model_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php + path: ../app/code/core/Mage/PageCache/Helper/Data.php - - message: "#^Access to an undefined property Mage_Paypal_Controller_Express_Abstract\\:\\:\\$_configMethod\\.$#" + message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:isPartialAuthorization\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php + path: ../app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php - - message: "#^Access to an undefined property Mage_Paypal_Controller_Express_Abstract\\:\\:\\$_configType\\.$#" + message: "#^Property Mage_Payment_Block_Info\\:\\:\\$_paymentSpecificInformation \\(Varien_Object\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php + path: ../app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php - - message: "#^Variable \\$isAjax might not be defined\\.$#" + message: "#^Cannot assign new offset to string\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php + path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$sandboxFlag\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Helper/Data.php + message: "#^Variable \\$defaultExceptionMessage might not be defined\\.$#" + count: 2 + path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$apiAuthentication\\.$#" + message: "#^Variable \\$newTransactionType might not be defined\\.$#" + count: 3 + path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php + + - + message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:cancelPartialAuthorization\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Abstract.php + path: ../app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$apiPassword\\.$#" + message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:cancelPartialAuthorization\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Abstract.php + path: ../app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$apiSignature\\.$#" + message: "#^Property Mage_Core_Block_Template\\:\\:\\$_template \\(string\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Abstract.php + path: ../app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$apiUsername\\.$#" + message: "#^Property Mage_Payment_Block_Catalog_Product_View_Profile\\:\\:\\$_profile \\(Mage_Payment_Model_Recurring_Profile\\) does not accept default value of type false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Abstract.php + path: ../app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$debug\\.$#" + message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isAvailable\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Abstract.php + path: ../app/code/core/Mage/Payment/Helper/Data.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$sandboxFlag\\.$#" + message: "#^Method Mage_Payment_Helper_Data\\:\\:getStoreMethods\\(\\) should return array\\ but returns array\\\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php + path: ../app/code/core/Mage/Payment/Helper/Data.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$verifyPeer\\.$#" + message: "#^Method Mage_Payment_Model_Config\\:\\:_getMethod\\(\\) should return Mage_Payment_Model_Method_Abstract\\|false but returns Mage_Core_Model_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php + path: ../app/code/core/Mage/Payment/Model/Config.php - - message: "#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\\:\\:_export\\(\\)\\.$#" + message: "#^Comparison operation \"\\<\" between \\(array\\|float\\|int\\) and 0\\.0001 results in an error\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php + path: ../app/code/core/Mage/Payment/Model/Method/Abstract.php - - message: "#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\\:\\:_import\\(\\)\\.$#" + message: "#^Binary operation \"\\*\\=\" between string and 2 results in an error\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php + path: ../app/code/core/Mage/Payment/Model/Method/Cc.php - - message: "#^Call to an undefined method Varien_Object\\:\\:isNominal\\(\\)\\.$#" + message: "#^Method Mage_Payment_Model_Recurring_Profile\\:\\:exportStartDatetime\\(\\) should return string\\|Zend_Date but empty return statement found\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Cart.php + path: ../app/code/core/Mage/Payment/Model/Recurring/Profile.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$allow_ba_signup\\.$#" + message: "#^Property Mage_Paypal_Block_Adminhtml_System_Config_Field_Country\\:\\:\\$_defaultCountry \\(string\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$api_cert\\.$#" + message: "#^Method Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Group\\:\\:_getCollapseState\\(\\) should return bool but returns int\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$api_password\\.$#" + message: "#^Method Mage_Paypal_Block_Express_Review\\:\\:_formatPrice\\(\\) should return string but returns float\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Express/Review.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$api_signature\\.$#" + message: "#^Method Mage_Paypal_Block_Express_Review\\:\\:_getShippingPrice\\(\\) should return bool but returns float\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Express/Review.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$api_username\\.$#" + message: "#^Return type \\(false\\) of method Mage_Paypal_Block_Hosted_Pro_Info\\:\\:getCcTypeName\\(\\) should be compatible with return type \\(string\\|null\\) of method Mage_Paypal_Block_Payment_Info\\:\\:getCcTypeName\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$businessAccount\\.$#" + message: "#^Method Mage_Paypal_Block_Iframe\\:\\:_getBlock\\(\\) should return \\$this\\(Mage_Paypal_Block_Iframe\\) but returns Mage_Payment_Block_Form\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Iframe.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$business_account\\.$#" + message: "#^Property Mage_Paypal_Block_Iframe\\:\\:\\$_block \\(Mage_Payment_Block_Form\\) does not accept Mage_Core_Block_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Iframe.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$buttonFlavor\\.$#" + message: "#^Return type \\(false\\) of method Mage_Paypal_Block_Payflow_Link_Info\\:\\:getCcTypeName\\(\\) should be compatible with return type \\(string\\|null\\) of method Mage_Paypal_Block_Payment_Info\\:\\:getCcTypeName\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$buttonType\\.$#" - count: 2 - path: ../app/code/core/Mage/Paypal/Model/Config.php + message: "#^Method Mage_Paypal_Controller_Express_Abstract\\:\\:_initCheckout\\(\\) should return Mage_Paypal_Model_Express_Checkout but returns Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$paymentAction\\.$#" + message: "#^Method Mage_Paypal_Controller_Express_Abstract\\:\\:_initToken\\(\\) should return Mage_Paypal_ExpressController\\|string but returns \\$this\\(Mage_Paypal_Controller_Express_Abstract\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$paymentMarkSize\\.$#" + message: "#^Property Mage_Paypal_Controller_Express_Abstract\\:\\:\\$_checkout \\(Mage_Paypal_Model_Express_Checkout\\) does not accept Mage_Core_Model_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$sandboxFlag\\.$#" - count: 3 - path: ../app/code/core/Mage/Paypal/Model/Config.php + message: "#^Property Mage_Paypal_Controller_Express_Abstract\\:\\:\\$_config \\(Mage_Paypal_Model_Config\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php - - message: "#^Default value of the parameter \\#2 \\$type \\(false\\) of method Mage_Paypal_Model_Config\\:\\:getAdditionalOptionsLogoUrl\\(\\) is incompatible with type string\\.$#" + message: "#^Property Mage_Paypal_Controller_Express_Abstract\\:\\:\\$_quote \\(Mage_Sales_Model_Quote\\) does not accept default value of type false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php - - message: "#^Method Mage_Paypal_Model_Config\\:\\:_matchBnCountryCode\\(\\) should return string\\|null but return statement is missing\\.$#" + message: "#^Variable \\$isAjax might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php + + - + message: "#^Method Mage_Paypal_Model_Api_Abstract\\:\\:_exportLineItems\\(\\) should return bool but empty return statement found\\.$#" + count: 2 + path: ../app/code/core/Mage/Paypal/Model/Api/Abstract.php - - message: "#^Method Mage_Paypal_Model_Config\\:\\:getPaymentAction\\(\\) should return string\\|null but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\\:\\:_export\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php + path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$cctypes\\.$#" + message: "#^Call to an undefined method Mage_Paypal_Model_Api_Nvp\\:\\:_import\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php + path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" + message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_exportLineItems\\(\\) should return true\\|null but empty return statement found\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php + path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$paymentAction\\.$#" + message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_exportLineItems\\(\\) should return true\\|null but returns bool\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php + path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" + message: "#^Method Mage_Paypal_Model_Api_Standard\\:\\:_exportLineItems\\(\\) should return true\\|null but empty return statement found\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php + path: ../app/code/core/Mage/Paypal/Model/Api/Standard.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$paymentAction\\.$#" + message: "#^Method Mage_Paypal_Model_Api_Standard\\:\\:_exportLineItems\\(\\) should return true\\|null but returns bool\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php + path: ../app/code/core/Mage/Paypal/Model/Api/Standard.php - - message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:lookupTransaction\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Paypal/Model/Express.php + message: "#^Call to an undefined method Varien_Object\\:\\:isNominal\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Paypal/Model/Cart.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$allow_ba_signup\\.$#" + message: "#^Property Mage_Paypal_Model_Direct\\:\\:\\$_pro \\(Mage_Paypal_Model_Pro\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express/Checkout.php + path: ../app/code/core/Mage/Paypal/Model/Direct.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" + message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:lookupTransaction\\(\\)\\.$#" count: 2 - path: ../app/code/core/Mage/Paypal/Model/Express/Checkout.php + path: ../app/code/core/Mage/Paypal/Model/Express.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$paymentAction\\.$#" + message: "#^Method Mage_Paypal_Model_Express\\:\\:assignData\\(\\) should return Mage_Payment_Model_Info but returns \\$this\\(Mage_Paypal_Model_Express\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express/Checkout.php - - - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$requireBillingAddress\\.$#" - count: 4 - path: ../app/code/core/Mage/Paypal/Model/Express/Checkout.php + path: ../app/code/core/Mage/Paypal/Model/Express.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$solutionType\\.$#" + message: "#^Property Mage_Paypal_Model_Express\\:\\:\\$_pro \\(Mage_Paypal_Model_Pro\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express/Checkout.php + path: ../app/code/core/Mage/Paypal/Model/Express.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$transferShippingOptions\\.$#" + message: "#^Return type \\(Mage_Payment_Model_Info\\) of method Mage_Paypal_Model_Express\\:\\:assignData\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:assignData\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express/Checkout.php + path: ../app/code/core/Mage/Paypal/Model/Express.php - message: "#^Cannot call method getData\\(\\) on array\\.$#" @@ -3307,139 +4591,154 @@ parameters: path: ../app/code/core/Mage/Paypal/Model/Hostedpro.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$businessAccount\\.$#" + message: "#^Return type \\(bool\\) of method Mage_Paypal_Model_Hostedpro\\:\\:getAllowedCcTypes\\(\\) should be compatible with return type \\(string\\) of method Mage_Paypal_Model_Direct\\:\\:getAllowedCcTypes\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Ipn.php + path: ../app/code/core/Mage/Paypal/Model/Hostedpro.php + + - + message: "#^Return type \\(bool\\) of method Mage_Paypal_Model_Hostedpro\\:\\:validate\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Cc\\)\\) of method Mage_Payment_Model_Method_Cc\\:\\:validate\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Paypal/Model/Hostedpro.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$debug\\.$#" + message: "#^Binary operation \"\\-\" between array\\|string and array\\|string results in an error\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$verifyPeer\\.$#" + message: "#^Property Mage_Paypal_Model_Ipn\\:\\:\\$_order \\(Mage_Sales_Model_Order\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - message: "#^Binary operation \"\\-\" between array\\|string and array\\|string results in an error\\.$#" + message: "#^Property Mage_Paypal_Model_Ipn\\:\\:\\$_recurringProfile \\(Mage_Sales_Model_Recurring_Profile\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" + message: "#^Return type \\(bool\\) of method Mage_Paypal_Model_Payflowlink\\:\\:validate\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Cc\\)\\) of method Mage_Payment_Model_Method_Cc\\:\\:validate\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Method/Agreement.php + path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$paymentAction\\.$#" + message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Method/Agreement.php + path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php - - message: "#^Method Mage_Paypal_Model_Observer\\:\\:fetchReports\\(\\) should return \\$this\\(Mage_Paypal_Model_Observer\\) but return statement is missing\\.$#" + message: "#^Property Mage_Paypal_Model_Payflowpro\\:\\:\\$_centinelFieldMap \\(string\\) does not accept default value of type array\\\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Observer.php + path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - message: "#^Method Mage_Paypal_Model_Payflowlink\\:\\:_getTrxTokenType\\(\\) should return string but return statement is missing\\.$#" + message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php + path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - message: "#^Method Mage_Paypal_Model_Payflowlink\\:\\:initialize\\(\\) should return \\$this\\(Mage_Paypal_Model_Payflowlink\\) but return statement is missing\\.$#" + message: "#^Method Mage_Paypal_Model_Pro\\:\\:capture\\(\\) should return false\\|null but return statement is missing\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php + path: ../app/code/core/Mage/Paypal/Model/Pro.php - - message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" + message: "#^Property Mage_Paypal_Model_Pro\\:\\:\\$_api \\(Mage_Paypal_Model_Api_Nvp\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php + path: ../app/code/core/Mage/Paypal/Model/Pro.php - - message: "#^Cannot call method setCurrency\\(\\) on array\\|object\\.$#" + message: "#^Property Mage_Paypal_Model_Pro\\:\\:\\$_api \\(Mage_Paypal_Model_Api_Nvp\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php + path: ../app/code/core/Mage/Paypal/Model/Pro.php - - message: "#^Cannot call method setCustref\\(\\) on array\\|object\\.$#" + message: "#^Property Mage_Paypal_Model_Pro\\:\\:\\$_config \\(Mage_Paypal_Model_Config\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php + path: ../app/code/core/Mage/Paypal/Model/Pro.php - - message: "#^Cannot call method setFirstname\\(\\) on array\\|object\\.$#" + message: "#^Method Mage_Paypal_Model_Standard\\:\\:initialize\\(\\) should return \\$this\\(Mage_Paypal_Model_Standard\\) but return statement is missing\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php + path: ../app/code/core/Mage/Paypal/Model/Standard.php - - message: "#^Cannot call method setShiptofirstname\\(\\) on array\\|object\\.$#" + message: "#^Method Varien_Data_Collection\\:\\:toOptionArray\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php + path: ../app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php - - message: "#^Method Mage_Paypal_Model_Payflowpro\\:\\:getConfigPaymentAction\\(\\) should return string but return statement is missing\\.$#" + message: "#^Method Varien_Data_Collection\\:\\:toOptionArray\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php + path: ../app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php - - message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" + message: "#^Method Mage_Paypal_HostedproController\\:\\:_getIframeBlock\\(\\) should return Mage_Paypal_Block_Hosted_Pro_Iframe but returns Mage_Core_Block_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php + path: ../app/code/core/Mage/Paypal/controllers/HostedproController.php - - message: "#^Method Mage_Paypal_Model_Payment_Transaction\\:\\:setAdditionalInformation\\(\\) has invalid return type Mage_Paypal_Model_Order_Payment_Transaction\\.$#" + message: "#^Method Mage_Paypal_PayflowController\\:\\:_getIframeBlock\\(\\) should return Mage_Paypal_Block_Payflow_Link_Iframe but returns Mage_Core_Block_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payment/Transaction.php + path: ../app/code/core/Mage/Paypal/controllers/PayflowController.php - - message: "#^Method Mage_Paypal_Model_Pro\\:\\:capture\\(\\) should return false\\|null but return statement is missing\\.$#" + message: "#^Method Mage_Paypal_PayflowadvancedController\\:\\:_getIframeBlock\\(\\) should return Mage_Paypal_Block_Payflow_Advanced_Iframe but returns Mage_Core_Block_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php + path: ../app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isFailsafe\\(\\)\\.$#" + message: "#^Variable \\$key might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php + path: ../app/code/core/Mage/Poll/Block/ActivePoll.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" + message: "#^Variable \\$value might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php + path: ../app/code/core/Mage/Poll/Block/ActivePoll.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsSummary\\.$#" + message: "#^Method Mage_Poll_Model_Poll\\:\\:getPoolId\\(\\) should return int but returns string\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php + path: ../app/code/core/Mage/Poll/Model/Poll.php - - message: "#^Method Mage_Paypal_Model_Standard\\:\\:initialize\\(\\) should return \\$this\\(Mage_Paypal_Model_Standard\\) but return statement is missing\\.$#" + message: "#^Method Mage_Poll_Model_Poll\\:\\:getRandomId\\(\\) should return string but returns int\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php + path: ../app/code/core/Mage/Poll/Model/Poll.php - - message: "#^Method Mage_Paypal_Model_System_Config_Backend_MerchantCountry\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_Paypal_Model_System_Config_Backend_MerchantCountry\\) but return statement is missing\\.$#" + message: "#^Method Mage_Poll_Model_Resource_Poll\\:\\:checkAnswerId\\(\\) should return bool but returns string\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php + path: ../app/code/core/Mage/Poll/Model/Resource/Poll.php - - message: "#^Method Varien_Data_Collection\\:\\:toOptionArray\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Method Mage_Poll_Model_Resource_Poll\\:\\:getRandomId\\(\\) should return int but returns string\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php + path: ../app/code/core/Mage/Poll/Model/Resource/Poll.php - - message: "#^Method Varien_Data_Collection\\:\\:toOptionArray\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Method Mage_Poll_Model_Resource_Poll_Answer_Collection\\:\\:countPercent\\(\\) should return \\$this\\(Mage_Poll_Model_Resource_Poll_Answer_Collection\\) but empty return statement found\\.$#" count: 1 - path: ../app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php + path: ../app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php - - message: "#^Variable \\$key might not be defined\\.$#" + message: "#^Method Mage_ProductAlert_Helper_Data\\:\\:createBlock\\(\\) should return string but returns Mage_Core_Block_Abstract\\.$#" count: 1 - path: ../app/code/core/Mage/Poll/Block/ActivePoll.php + path: ../app/code/core/Mage/ProductAlert/Helper/Data.php - - message: "#^Variable \\$value might not be defined\\.$#" + message: "#^Property Mage_ProductAlert_Model_Email\\:\\:\\$_customer \\(Mage_Customer_Model_Customer\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Poll/Block/ActivePoll.php + path: ../app/code/core/Mage/ProductAlert/Model/Email.php + + - + message: "#^Property Mage_ProductAlert_Model_Email\\:\\:\\$_priceBlock \\(Mage_ProductAlert_Block_Email_Price\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/ProductAlert/Model/Email.php + + - + message: "#^Property Mage_ProductAlert_Model_Email\\:\\:\\$_stockBlock \\(Mage_ProductAlert_Block_Email_Stock\\) does not accept string\\.$#" + count: 1 + path: ../app/code/core/Mage/ProductAlert/Model/Email.php - message: "#^Method Mage_ProductAlert_Model_Observer\\:\\:process\\(\\) invoked with 1 parameter, 0 required\\.$#" @@ -3447,9 +4746,14 @@ parameters: path: ../app/code/core/Mage/ProductAlert/controllers/AddController.php - - message: "#^Method Mage_ProductAlert_UnsubscribeController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_ProductAlert_UnsubscribeController\\) but return statement is missing\\.$#" + message: "#^Return type \\(void\\) of method Mage_ProductAlert_AddController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Controller_Front_Action\\)\\) of method Mage_Core_Controller_Front_Action\\:\\:preDispatch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php + path: ../app/code/core/Mage/ProductAlert/controllers/AddController.php + + - + message: "#^Method Mage_Rating_Model_Resource_Rating\\:\\:getEntityIdByCode\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Rating/Model/Resource/Rating.php - message: "#^Variable \\$data in empty\\(\\) always exists and is not falsy\\.$#" @@ -3466,6 +4770,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php + - + message: "#^Method Mage_Rating_Model_Resource_Rating_Entity\\:\\:getIdByCode\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php + + - + message: "#^Property Mage_Reports_Block_Product_Abstract\\:\\:\\$_indexModel \\(Mage_Reports_Model_Product_Index_Abstract\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Block/Product/Abstract.php + - message: "#^Variable \\$dateStart might not be defined\\.$#" count: 7 @@ -3476,11 +4790,21 @@ parameters: count: 1 path: ../app/code/core/Mage/Reports/Helper/Data.php + - + message: "#^Property Mage_Reports_Model_Grouped_Collection\\:\\:\\$_resourceCollection \\(Mage_Core_Model_Resource_Db_Collection_Abstract\\) does not accept Varien_Data_Collection_Db\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Grouped/Collection.php + - message: "#^Method Mage_Reports_Model_Resource_Product_Index_Abstract\\:\\:clean\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 1 path: ../app/code/core/Mage/Reports/Model/Product/Index/Abstract.php + - + message: "#^Property Mage_Reports_Model_Report\\:\\:\\$_reportModel \\(Mage_Reports_Model_Report\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Report.php + - message: "#^Call to an undefined method Mage_Customer_Model_Customer\\:\\:remove\\(\\)\\.$#" count: 1 @@ -3496,6 +4820,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Reports/Model/Resource/Event.php + - + message: "#^Method Mage_Reports_Model_Resource_Helper_Mysql4\\:\\:mergeVisitorProductIndex\\(\\) should return string but returns int\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php + - message: "#^Method Mage_Reports_Model_Resource_Order_Collection\\:\\:_prepareSummaryAggregated\\(\\) invoked with 4 parameters, 3 required\\.$#" count: 1 @@ -3506,6 +4835,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Reports/Model/Resource/Product/Collection.php + - + message: "#^Property Mage_Reports_Model_Resource_Report_Collection\\:\\:\\$_from \\(string\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Resource/Report/Collection.php + + - + message: "#^Property Mage_Reports_Model_Resource_Report_Collection\\:\\:\\$_to \\(string\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Resource/Report/Collection.php + - message: "#^Comparison operation \"\\!\\=\" between array\\|int and 0 results in an error\\.$#" count: 1 @@ -3522,164 +4861,369 @@ parameters: path: ../app/code/core/Mage/Reports/Model/Resource/Review/Collection.php - - message: "#^Call to an undefined static method Mage_Review_Model_Resource_Review_Collection\\:\\:resetSelect\\(\\)\\.$#" + message: "#^Call to an undefined static method Mage_Review_Model_Resource_Review_Collection\\:\\:resetSelect\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Resource/Review/Collection.php + + - + message: "#^Method Mage_Reports_Model_Resource_Wishlist_Collection\\:\\:getSharedCount\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php + + - + message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php + + - + message: "#^Property DOMNode\\:\\:\\$nodeValue \\(string\\|null\\) does not accept int\\\\|int\\<1, max\\>\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Test.php + + - + message: "#^Argument of an invalid type Mage_Reports_Model_Report supplied for foreach, only iterables are supported\\.$#" + count: 1 + path: ../app/code/core/Mage/Reports/Model/Totals.php + + - + message: "#^Return type \\(string\\) of method Mage_Review_Block_Form\\:\\:getAction\\(\\) should be compatible with return type \\(Mage_Core_Controller_Varien_Action\\) of method Mage_Core_Block_Abstract\\:\\:getAction\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Review/Block/Form.php + + - + message: "#^Method Mage_Review_Model_Resource_Review\\:\\:getEntityIdByCode\\(\\) should return bool\\|int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Review/Model/Resource/Review.php + + - + message: "#^Method Mage_Review_Model_Resource_Review\\:\\:getTotalReviews\\(\\) should return int but returns string\\.$#" + count: 1 + path: ../app/code/core/Mage/Review/Model/Resource/Review.php + + - + message: "#^Comparison operation \"\\=\\=\" between array\\|null and 1 results in an error\\.$#" + count: 1 + path: ../app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php + + - + message: "#^Comparison operation \"\\=\\=\" between array\\|null and 2 results in an error\\.$#" + count: 1 + path: ../app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php + + - + message: "#^Cannot call method getId\\(\\) on true\\.$#" + count: 1 + path: ../app/code/core/Mage/Rss/Helper/Data.php + + - + message: "#^Offset 'actions'\\|'conditions' on array\\{\\} in isset\\(\\) does not exist\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Abstract.php + + - + message: "#^Call to an undefined method Mage_Rule_Model_Action_Interface\\:\\:getId\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + + - + message: "#^Call to an undefined method Mage_Rule_Model_Action_Interface\\:\\:setId\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + + - + message: "#^Call to an undefined method Mage_Rule_Model_Action_Interface\\:\\:setRule\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + + - + message: "#^Cannot call method loadArray\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + + - + message: "#^Binary operation \"\\.\" between array and ' ' results in an error\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Condition/Abstract.php + + - + message: "#^Variable \\$valueArr in empty\\(\\) always exists and is always falsy\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Condition/Abstract.php + + - + message: "#^Method Mage_Rule_Model_Condition_Abstract\\:\\:loadArray\\(\\) invoked with 2 parameters, 1 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Condition/Combine.php + + - + message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php + + - + message: "#^Method Mage_Rule_Model_Condition_Product_Abstract\\:\\:getAttributeObject\\(\\) should return Mage_Catalog_Model_Resource_Eav_Attribute but returns Varien_Object\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php + + - + message: "#^Cannot call method setParentFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Comments.php + + - + message: "#^Property Mage_Sales_Block_Order_Comments\\:\\:\\$_commentCollection \\(Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Comments.php + + - + message: "#^Property Mage_Sales_Block_Order_Comments\\:\\:\\$_commentCollection \\(Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Comments.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Creditmemo\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Creditmemo.php + + - + message: "#^Call to method setOrderFilter\\(\\) on an unknown class Mage_Sales_Model_Resource_Invoice_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Details.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Email_Creditmemo_Items\\:\\:_prepareItem\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Block_Items_Abstract\\)\\) of method Mage_Sales_Block_Items_Abstract\\:\\:_prepareItem\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Email_Invoice_Items\\:\\:_prepareItem\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Block_Items_Abstract\\)\\) of method Mage_Sales_Block_Items_Abstract\\:\\:_prepareItem\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Email_Shipment_Items\\:\\:_prepareItem\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Block_Items_Abstract\\)\\) of method Mage_Sales_Block_Items_Abstract\\:\\:_prepareItem\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Info\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Info.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Invoice\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Invoice.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Print\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Print.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Print_Creditmemo\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Print_Invoice\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Print/Invoice.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Print_Shipment\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Print/Shipment.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_Shipment\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/Shipment.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Block_Order_View\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Order/View.php + + - + message: "#^Property Mage_Sales_Block_Recurring_Profiles\\:\\:\\$_profiles \\(Mage_Sales_Model_Resource_Recurring_Profile_Collection\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Block/Recurring/Profiles.php + + - + message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:getClassName\\(\\)\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Config/Ordered.php + + - + message: "#^Call to an undefined method Mage_Sales_Model_Resource_Quote_Collection\\:\\:addAttributeToSelect\\(\\)\\.$#" + count: 2 + path: ../app/code/core/Mage/Sales/Model/Entity/Quote.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Backend_Region\\:\\:beforeSave\\(\\) should be compatible with return type \\(\\$this\\(Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\)\\) of method Mage_Eav_Model_Entity_Attribute_Backend_Abstract\\:\\:beforeSave\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php + + - + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Reports/Model/Resource/Review/Collection.php + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Custbalance.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Discount\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php - - message: "#^Comparison operation \"\\=\\=\" between array\\|null and 1 results in an error\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Grand\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php - - message: "#^Comparison operation \"\\=\\=\" between array\\|null and 2 results in an error\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Shipping\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Shipping.php - - message: "#^Method Mage_Review_CustomerController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Review_CustomerController\\) but return statement is missing\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Subtotal\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Review/controllers/CustomerController.php + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Subtotal.php - - message: "#^Cannot call method getId\\(\\) on true\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Tax\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Rss/Helper/Data.php + path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php - - message: "#^Offset 'actions'\\|'conditions' on array\\{\\} in isset\\(\\) does not exist\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_addresses \\(iterable\\&Mage_Sales_Model_Resource_Order_Address_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Abstract.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Call to an undefined method Mage_Rule_Model_Action_Interface\\:\\:getId\\(\\)\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_creditmemos \\(\\(iterable\\&Mage_Sales_Model_Resource_Order_Creditmemo_Collection\\)\\|false\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Call to an undefined method Mage_Rule_Model_Action_Interface\\:\\:setId\\(\\)\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_invoices \\(Mage_Sales_Model_Resource_Order_Invoice_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Call to an undefined method Mage_Rule_Model_Action_Interface\\:\\:setRule\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_items \\(iterable\\&Mage_Sales_Model_Resource_Order_Item_Collection\\) does not accept null\\.$#" + count: 2 + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Cannot call method loadArray\\(\\) on Mage_Core_Model_Abstract\\|false\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_payments \\(iterable\\&Mage_Sales_Model_Resource_Order_Payment_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Action/Collection.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Binary operation \"\\.\" between array and ' ' results in an error\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_shipments \\(Mage_Sales_Model_Resource_Order_Shipment_Collection\\|false\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Condition/Abstract.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Variable \\$valueArr in empty\\(\\) always exists and is always falsy\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_statusHistory \\(iterable\\&Mage_Sales_Model_Resource_Order_Status_History_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Condition/Abstract.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Method Mage_Rule_Model_Condition_Abstract\\:\\:loadArray\\(\\) invoked with 2 parameters, 1 required\\.$#" + message: "#^Property Mage_Sales_Model_Order\\:\\:\\$_tracks \\(Mage_Sales_Model_Resource_Order_Shipment_Track_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Condition/Combine.php + path: ../app/code/core/Mage/Sales/Model/Order.php - - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Variable \\$oldArea might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php + path: ../app/code/core/Mage/Sales/Model/Order/Api.php - - message: "#^Cannot call method setParentFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" + message: "#^Variable \\$oldStore might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Block/Order/Comments.php + path: ../app/code/core/Mage/Sales/Model/Order/Api.php - - message: "#^Call to method setOrderFilter\\(\\) on an unknown class Mage_Sales_Model_Resource_Invoice_Collection\\.$#" + message: "#^Cannot call method addAttributeToFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Block/Order/Details.php + path: ../app/code/core/Mage/Sales/Model/Order/Invoice.php - - message: "#^Method Mage_Sales_Model_Billing_Agreement\\:\\:getStatusLabel\\(\\) should return string but return statement is missing\\.$#" + message: "#^Property Mage_Sales_Model_Order_Invoice\\:\\:\\$_comments \\(iterable\\&Mage_Sales_Model_Resource_Order_Invoice_Comment_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Billing/Agreement.php + path: ../app/code/core/Mage/Sales/Model/Order/Invoice.php - - message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:getClassName\\(\\)\\.$#" + message: "#^Property Mage_Sales_Model_Order_Invoice\\:\\:\\$_items \\(iterable\\&Mage_Sales_Model_Resource_Order_Invoice_Item_Collection\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Config/Ordered.php + path: ../app/code/core/Mage/Sales/Model/Order/Invoice.php - - message: "#^Call to an undefined method Mage_Sales_Model_Resource_Quote_Collection\\:\\:addAttributeToSelect\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Sales/Model/Entity/Quote.php + message: "#^Property Mage_Sales_Model_Order_Invoice\\:\\:\\$_order \\(Mage_Sales_Model_Order\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Order/Invoice.php - - message: "#^Cannot call method getItemById\\(\\) on bool\\.$#" + message: "#^Property Varien_Object\\:\\:\\$_origData \\(array\\) does not accept null\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php + path: ../app/code/core/Mage/Sales/Model/Order/Invoice.php - - message: "#^Cannot call method getItemById\\(\\) on true\\.$#" + message: "#^Property Mage_Sales_Model_Order_Invoice_Item\\:\\:\\$_orderItem \\(Mage_Sales_Model_Order_Item\\) does not accept Varien_Object\\|null\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php + path: ../app/code/core/Mage/Sales/Model/Order/Invoice/Item.php - - message: "#^Variable \\$oldArea might not be defined\\.$#" + message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getForceApplyDiscountToParentItem\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Api.php + path: ../app/code/core/Mage/Sales/Model/Order/Item.php - - message: "#^Variable \\$oldStore might not be defined\\.$#" + message: "#^Method Mage_Sales_Model_Order_Payment\\:\\:_addTransaction\\(\\) should return Mage_Sales_Model_Order_Payment_Transaction\\|null but return statement is missing\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Api.php + path: ../app/code/core/Mage/Sales/Model/Order/Payment.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:addComment\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php + message: "#^Property Mage_Sales_Model_Order_Payment\\:\\:\\$_canVoidLookup \\(string\\) does not accept bool\\.$#" + count: 2 + path: ../app/code/core/Mage/Sales/Model/Order/Payment.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:canCancel\\(\\)\\.$#" + message: "#^Property Mage_Sales_Model_Order_Payment_Transaction\\:\\:\\$_identifiedChildren \\(array\\) does not accept false\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php + path: ../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:cancel\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php + message: "#^Property Mage_Sales_Model_Order_Payment_Transaction\\:\\:\\$_order \\(Mage_Sales_Model_Order_Payment\\) does not accept Mage_Sales_Model_Order\\.$#" + count: 2 + path: ../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:sendUpdateEmail\\(\\)\\.$#" + message: "#^Property Mage_Sales_Model_Order_Payment_Transaction\\:\\:\\$_order \\(Mage_Sales_Model_Order_Payment\\) does not accept false\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php + path: ../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php - - message: "#^Variable \\$data in isset\\(\\) always exists and is not nullable\\.$#" + message: "#^Property Mage_Sales_Model_Order_Payment_Transaction\\:\\:\\$_parentTransaction \\(\\$this\\(Mage_Sales_Model_Order_Payment_Transaction\\)\\) does not accept Mage_Sales_Model_Order_Payment_Transaction\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php + path: ../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php - - message: "#^Cannot call method addAttributeToFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Invoice.php + message: "#^Property Mage_Sales_Model_Order_Payment_Transaction\\:\\:\\$_parentTransaction \\(\\$this\\(Mage_Sales_Model_Order_Payment_Transaction\\)\\) does not accept false\\.$#" + count: 2 + path: ../app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getForceApplyDiscountToParentItem\\(\\)\\.$#" + message: "#^Method Mage_Sales_Model_Order_Pdf_Abstract\\:\\:getAlignCenter\\(\\) should return int but returns float\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Item.php + path: ../app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php - - message: "#^Method Mage_Sales_Model_Order_Payment\\:\\:_addTransaction\\(\\) should return Mage_Sales_Model_Order_Payment_Transaction\\|null but return statement is missing\\.$#" + message: "#^Method Mage_Sales_Model_Order_Pdf_Abstract\\:\\:getAlignRight\\(\\) should return int but returns float\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Order/Payment.php + path: ../app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php - message: "#^Variable \\$shippingAddress might not be defined\\.$#" @@ -3696,6 +5240,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php + - + message: "#^Method Mage_Sales_Model_Order_Pdf_Items_Abstract\\:\\:getSku\\(\\) should return string but returns array\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php + - message: "#^Variable \\$shipment might not be defined\\.$#" count: 1 @@ -3706,6 +5255,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Order/Shipment/Api.php + - + message: "#^Method Mage_Sales_Model_Quote\\:\\:getIsVirtual\\(\\) should return bool but returns int\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote.php + + - + message: "#^Property Mage_Sales_Model_Quote\\:\\:\\$_addresses \\(Mage_Sales_Model_Resource_Order_Address_Collection\\) does not accept Mage_Sales_Model_Resource_Quote_Address_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote.php + - message: "#^Variable \\$item might not be defined\\.$#" count: 1 @@ -3716,6 +5275,16 @@ parameters: count: 2 path: ../app/code/core/Mage/Sales/Model/Quote.php + - + message: "#^Method Mage_Sales_Model_Quote_Address\\:\\:getItemsCollection\\(\\) should return Mage_Eav_Model_Entity_Collection_Abstract but returns iterable\\&Mage_Sales_Model_Resource_Quote_Address_Item_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address.php + + - + message: "#^Property Mage_Sales_Model_Quote_Address\\:\\:\\$_nominalOnly \\(bool\\) does not accept null\\.$#" + count: 2 + path: ../app/code/core/Mage/Sales/Model/Quote/Address.php + - message: "#^Variable \\$totalInstance might not be defined\\.$#" count: 3 @@ -3726,21 +5295,91 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php + - + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Quote_Address_Total_Discount\\)\\) of method Mage_Sales_Model_Quote_Address_Total_Discount\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php + + - + message: "#^Return type \\(Mage_Sales_Model_Quote_Address_Total_Grand\\) of method Mage_Sales_Model_Quote_Address_Total_Grand\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php + + - + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Quote_Address_Total_Nominal\\)\\) of method Mage_Sales_Model_Quote_Address_Total_Nominal\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php + + - + message: "#^Return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Nominal_Shipping\\:\\:fetch\\(\\) should be compatible with return type \\(Mage_Sales_Model_Quote_Address_Total_Shipping\\) of method Mage_Sales_Model_Quote_Address_Total_Shipping\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Shipping.php + + - + message: "#^Return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Nominal_Subtotal\\:\\:fetch\\(\\) should be compatible with return type \\(Mage_Sales_Model_Quote_Address_Total_Subtotal\\) of method Mage_Sales_Model_Quote_Address_Total_Subtotal\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Subtotal.php + + - + message: "#^Return type \\(Mage_Sales_Model_Quote_Address_Total_Shipping\\) of method Mage_Sales_Model_Quote_Address_Total_Shipping\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php + - message: "#^Variable \\$addressQty in isset\\(\\) always exists and is not nullable\\.$#" count: 1 path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Shipping.php + - + message: "#^Return type \\(Mage_Sales_Model_Quote_Address_Total_Subtotal\\) of method Mage_Sales_Model_Quote_Address_Total_Subtotal\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Subtotal.php + + - + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Quote_Address_Total_Tax\\)\\) of method Mage_Sales_Model_Quote_Address_Total_Tax\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Address/Total/Tax.php + + - + message: "#^Method Mage_Sales_Model_Quote_Item\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Sales_Model_Quote_Item\\) but should not return anything\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Item.php + - message: "#^Method Mage_Sales_Model_Quote_Item\\:\\:save\\(\\) should return \\$this\\(Mage_Sales_Model_Quote_Item\\) but return statement is missing\\.$#" count: 1 path: ../app/code/core/Mage/Sales/Model/Quote/Item.php - - message: "#^Access to an undefined property Mage_Sales_Model_Quote_Item_Abstract\\:\\:\\$_optionsByCode\\.$#" + message: "#^Property Mage_Sales_Model_Quote_Item\\:\\:\\$_quote \\(Mage_Sales_Model_Quote\\) does not accept null\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Item.php + + - + message: "#^Return type \\(void\\) of method Mage_Sales_Model_Quote_Item\\:\\:__clone\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Model_Quote_Item_Abstract\\)\\) of method Mage_Sales_Model_Quote_Item_Abstract\\:\\:__clone\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Item.php + + - + message: "#^Method Mage_Sales_Model_Quote_Item_Abstract\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Sales_Model_Quote_Item_Abstract\\) but should not return anything\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php + + - + message: "#^Method Mage_Sales_Model_Quote_Item_Abstract\\:\\:getParentItem\\(\\) should return \\$this\\(Mage_Sales_Model_Quote_Item_Abstract\\) but returns Mage_Sales_Model_Quote_Item_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php + + - + message: "#^Property Mage_Sales_Model_Quote_Item_Abstract\\:\\:\\$_parentItem \\(Mage_Sales_Model_Quote_Item_Abstract\\) does not accept null\\.$#" count: 1 path: ../app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php + - + message: "#^Method Mage_Sales_Model_Quote_Item_Option\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Sales_Model_Quote_Item_Option\\) but should not return anything\\.$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Quote/Item/Option.php + - message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:canGetRecurringProfileDetails\\(\\)\\.$#" count: 1 @@ -3767,49 +5406,54 @@ parameters: path: ../app/code/core/Mage/Sales/Model/Resource/Order/Address.php - - message: "#^Method Mage_Sales_Model_Resource_Order_Invoice_Collection\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_Sales_Model_Resource_Order_Invoice_Collection\\) but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isFailsafe\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Collection.php + path: ../app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isFailsafe\\(\\)\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance\\)\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Custbalance\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php + path: ../app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php - - message: "#^Comparison operation \"\\!\\=\" between array\\|int and 0 results in an error\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount\\)\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Discount\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php + path: ../app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php - - message: "#^Variable \\$currentStoreIds in isset\\(\\) always exists and is not nullable\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand\\)\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Grand\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php + path: ../app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php - - message: "#^Access to an undefined property Mage_Sales_Model_Resource_Sale_Collection\\:\\:\\$_orderStateValue\\.$#" - count: 2 - path: ../app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping\\)\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Shipping\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Shipping.php - - message: "#^Call to an undefined method Varien_Db_Adapter_Interface\\:\\:listTables\\(\\)\\.$#" + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal\\)\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Subtotal\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Setup.php + path: ../app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Subtotal.php + + - + message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax\\)\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend_Tax\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Resource_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Tax.php - - message: "#^Method Mage_Sales_Model_Service_Order\\:\\:_canInvoiceItem\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Comparison operation \"\\!\\=\" between array\\|int and 0 results in an error\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Service/Order.php + path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php - - message: "#^Method Mage_Sales_Model_Service_Order\\:\\:_canRefundItem\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Variable \\$currentStoreIds in isset\\(\\) always exists and is not nullable\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Service/Order.php + path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php - - message: "#^Method Mage_Sales_Model_Service_Order\\:\\:_canShipItem\\(\\) should return bool but return statement is missing\\.$#" + message: "#^Call to an undefined method Varien_Db_Adapter_Interface\\:\\:listTables\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/Model/Service/Order.php + path: ../app/code/core/Mage/Sales/Model/Resource/Setup.php - message: "#^Call to an undefined method Mage_Payment_Model_Recurring_Profile\\:\\:submit\\(\\)\\.$#" @@ -3817,7 +5461,7 @@ parameters: path: ../app/code/core/Mage/Sales/Model/Service/Quote.php - - message: "#^Method Mage_Sales_Billing_AgreementController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Sales_Billing_AgreementController\\) but return statement is missing\\.$#" + message: "#^Method Mage_Sales_Billing_AgreementController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Sales_Billing_AgreementController\\) but empty return statement found\\.$#" count: 1 path: ../app/code/core/Mage/Sales/controllers/Billing/AgreementController.php @@ -3832,19 +5476,24 @@ parameters: path: ../app/code/core/Mage/Sales/controllers/DownloadController.php - - message: "#^Method Mage_Sales_OrderController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Sales_OrderController\\) but return statement is missing\\.$#" + message: "#^Method Mage_Sales_Recurring_ProfileController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Sales_Recurring_ProfileController\\) but empty return statement found\\.$#" count: 1 - path: ../app/code/core/Mage/Sales/controllers/OrderController.php + path: ../app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php - - message: "#^Method Mage_Sales_Recurring_ProfileController\\:\\:preDispatch\\(\\) should return \\$this\\(Mage_Sales_Recurring_ProfileController\\) but return statement is missing\\.$#" + message: "#^Return type \\(Mage_SalesRule_Model_Quote_Discount\\) of method Mage_SalesRule_Model_Quote_Discount\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php + path: ../app/code/core/Mage/SalesRule/Model/Quote/Discount.php - - message: "#^Method Mage_SalesRule_Model_Observer\\:\\:sales_order_afterPlace\\(\\) should return Mage_SalesRule_Model_Observer but return statement is missing\\.$#" + message: "#^Return type \\(Mage_SalesRule_Model_Quote_Freeshipping\\) of method Mage_SalesRule_Model_Quote_Freeshipping\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" count: 1 - path: ../app/code/core/Mage/SalesRule/Model/Observer.php + path: ../app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php + + - + message: "#^Return type \\(array\\) of method Mage_SalesRule_Model_Quote_Nominal_Discount\\:\\:fetch\\(\\) should be compatible with return type \\(Mage_SalesRule_Model_Quote_Discount\\) of method Mage_SalesRule_Model_Quote_Discount\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php - message: "#^Binary operation \"\\+\\=\" between string and \\-1\\|1 results in an error\\.$#" @@ -3856,28 +5505,38 @@ parameters: count: 1 path: ../app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php + - + message: "#^Return type \\(Mage_SalesRule_Model_Rule_Condition_Product_Combine\\) of method Mage_SalesRule_Model_Rule\\:\\:getActionsInstance\\(\\) should be compatible with return type \\(Mage_Rule_Model_Action_Collection\\) of method Mage_Rule_Model_Abstract\\:\\:getActionsInstance\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/SalesRule/Model/Rule.php + + - + message: "#^Return type \\(string\\) of method Mage_SalesRule_Model_Rule_Condition_Product_Attribute_Assigned\\:\\:getOperatorName\\(\\) should be compatible with return type \\(array\\) of method Mage_Rule_Model_Condition_Abstract\\:\\:getOperatorName\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php + - message: "#^Call to an undefined method Mage_Rule_Model_Action_Collection\\:\\:validate\\(\\)\\.$#" count: 2 path: ../app/code/core/Mage/SalesRule/Model/Validator.php - - message: "#^Access to an undefined property Mage_Shipping_Model_Carrier_Abstract\\:\\:\\$_rawRequest\\.$#" + message: "#^Call to an undefined method Mage_Shipping_Model_Carrier_Abstract\\:\\:_getQuotes\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - message: "#^Access to an undefined property Mage_Shipping_Model_Carrier_Abstract\\:\\:\\$_result\\.$#" + message: "#^Call to an undefined method Mage_Shipping_Model_Carrier_Abstract\\:\\:_setFreeMethodRequest\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - message: "#^Call to an undefined method Mage_Shipping_Model_Carrier_Abstract\\:\\:_getQuotes\\(\\)\\.$#" + message: "#^Method Mage_Shipping_Model_Carrier_Abstract\\:\\:checkAvailableShipCountries\\(\\) should return \\$this\\(Mage_Shipping_Model_Carrier_Abstract\\)\\|bool\\|Mage_Core_Model_Abstract but returns Mage_Shipping_Model_Rate_Result_Error\\.$#" count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - message: "#^Call to an undefined method Mage_Shipping_Model_Carrier_Abstract\\:\\:_setFreeMethodRequest\\(\\)\\.$#" + message: "#^Property Mage_Shipping_Model_Carrier_Abstract\\:\\:\\$_numBoxes \\(int\\) does not accept float\\.$#" count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php @@ -3887,8 +5546,8 @@ parameters: path: ../app/code/core/Mage/Shipping/Model/Carrier/Pickup.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:append\\(\\)\\.$#" - count: 3 + message: "#^Method Mage_Shipping_Model_Carrier_Tablerate\\:\\:getRate\\(\\) should return Mage_Core_Model_Abstract but returns array\\|bool\\.$#" + count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php - @@ -3896,6 +5555,11 @@ parameters: count: 3 path: ../app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php + - + message: "#^Return type \\(void\\) of method Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection\\:\\:_initSelect\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Model_Resource_Db_Collection_Abstract\\)\\) of method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:_initSelect\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php + - message: "#^Comparison operation \"\\<\" between \\(array\\|float\\|int\\) and float results in an error\\.$#" count: 1 @@ -3932,44 +5596,49 @@ parameters: path: ../app/code/core/Mage/Tag/Block/Customer/Tags.php - - message: "#^Variable \\$result might not be defined\\.$#" + message: "#^Method Mage_Tag_Block_Product_List\\:\\:_beforeToHtml\\(\\) should return \\$this\\(Mage_Tag_Block_Product_List\\) but returns false\\.$#" count: 1 - path: ../app/code/core/Mage/Tag/Model/Api.php + path: ../app/code/core/Mage/Tag/Block/Product/List.php - - message: "#^Access to an undefined property Mage_Tag_Model_Entity_Customer_Collection\\:\\:\\$_read\\.$#" + message: "#^Property Mage_Tag_Block_Product_Result\\:\\:\\$_productCollection \\(Mage_Tag_Model_Resource_Tag_Collection\\) does not accept Mage_Tag_Model_Resource_Product_Collection\\.$#" count: 1 - path: ../app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php + path: ../app/code/core/Mage/Tag/Block/Product/Result.php - - message: "#^Variable \\$productsSku might not be defined\\.$#" + message: "#^Variable \\$result might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php + path: ../app/code/core/Mage/Tag/Model/Api.php - - message: "#^Method Mage_Tag_Model_Resource_Tag\\:\\:loadByName\\(\\) should return array\\|false but return statement is missing\\.$#" + message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Tag_Model_Api_V2\\:\\:_prepareDataForAdd\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Tag_Model_Api\\:\\:_prepareDataForAdd\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Tag/Model/Resource/Tag.php + path: ../app/code/core/Mage/Tag/Model/Api/V2.php - - message: "#^Variable \\$result might not be defined\\.$#" + message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Tag_Model_Api_V2\\:\\:_prepareDataForUpdate\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Tag_Model_Api\\:\\:_prepareDataForUpdate\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Tag/Model/Tag.php + path: ../app/code/core/Mage/Tag/Model/Api/V2.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:checkDiscountSettings\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php + message: "#^Return type \\(object\\) of method Mage_Tag_Model_Api_V2\\:\\:info\\(\\) should be compatible with return type \\(array\\) of method Mage_Tag_Model_Api\\:\\:info\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Tag/Model/Api/V2.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:checkDisplaySettings\\(\\)\\.$#" - count: 2 - path: ../app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php + message: "#^Access to an undefined property Mage_Tag_Model_Entity_Customer_Collection\\:\\:\\$_read\\.$#" + count: 1 + path: ../app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php + + - + message: "#^Variable \\$productsSku might not be defined\\.$#" + count: 1 + path: ../app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isAllowed\\(\\)\\.$#" + message: "#^Variable \\$result might not be defined\\.$#" count: 1 - path: ../app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php + path: ../app/code/core/Mage/Tag/Model/Tag.php - message: "#^Call to an undefined method Mage_Tax_Block_Sales_Order_Tax\\:\\:addTotal\\(\\)\\.$#" @@ -3981,11 +5650,41 @@ parameters: count: 1 path: ../app/code/core/Mage/Tax/Block/Sales/Order/Tax.php + - + message: "#^Property Mage_Tax_Block_Sales_Order_Tax\\:\\:\\$_source \\(Mage_Sales_Model_Order_Invoice\\) does not accept Mage_Sales_Model_Order\\.$#" + count: 1 + path: ../app/code/core/Mage/Tax/Block/Sales/Order/Tax.php + - message: "#^Call to an undefined method Mage_Core_Model_App\\:\\:getOrder\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Tax/Helper/Data.php + - + message: "#^Method Mage_Tax_Helper_Data\\:\\:needPriceConversion\\(\\) should return int\\|false but returns bool\\.$#" + count: 1 + path: ../app/code/core/Mage/Tax/Helper/Data.php + + - + message: "#^Property Mage_Tax_Model_Calculation\\:\\:\\$_customer \\(Mage_Customer_Model_Customer\\) does not accept false\\.$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Calculation.php + + - + message: "#^Property Mage_Tax_Model_Calculation\\:\\:\\$_defaultCustomerTaxClass \\(string\\) does not accept int\\.$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Calculation.php + + - + message: "#^Property Mage_Tax_Model_Calculation_Rate\\:\\:\\$_titles \\(array\\) does not accept Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection\\.$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Calculation/Rate.php + + - + message: "#^Method Mage_Tax_Model_Config_Notification\\:\\:_getConfig\\(\\) should return Mage_Core_Model_Config_Data but returns bool\\|Mage_Core_Model_Abstract\\.$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Config/Notification.php + - message: "#^Call to an undefined static method Mage_Core_Model_Config_Data\\:\\:afterSave\\(\\)\\.$#" count: 1 @@ -4006,6 +5705,21 @@ parameters: count: 1 path: ../app/code/core/Mage/Tax/Model/Resource/Calculation.php + - + message: "#^Return type \\(void\\) of method Mage_Tax_Model_Sales_Total_Quote_Discount\\:\\:collect\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Model_Quote_Address_Total_Abstract\\)\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:collect\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php + + - + message: "#^Return type \\(array\\) of method Mage_Tax_Model_Sales_Total_Quote_Nominal_Tax\\:\\:fetch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Tax_Model_Sales_Total_Quote_Tax\\)\\) of method Mage_Tax_Model_Sales_Total_Quote_Tax\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Sales/Total/Quote/Nominal/Tax.php + + - + message: "#^Return type \\(\\$this\\(Mage_Tax_Model_Sales_Total_Quote_Tax\\)\\) of method Mage_Tax_Model_Sales_Total_Quote_Tax\\:\\:fetch\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Quote_Address_Total_Abstract\\:\\:fetch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php + - message: "#^Variable \\$baseRowTax might not be defined\\.$#" count: 3 @@ -4066,6 +5780,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Uploader/Helper/File.php + - + message: "#^Method Mage_Widget_Block_Adminhtml_Widget_Chooser\\:\\:getConfig\\(\\) should return Varien_Object but returns mixed\\.$#" + count: 2 + path: ../app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php + - message: "#^Variable \\$options might not be defined\\.$#" count: 1 @@ -4087,9 +5806,19 @@ parameters: path: ../app/code/core/Mage/Widget/Model/Widget/Instance.php - - message: "#^Method Mage_Wishlist_Block_Customer_Wishlist_Item_Column\\:\\:_beforeChildToHtml\\(\\) should return string but return statement is missing\\.$#" + message: "#^Return type \\(void\\) of method Mage_Wishlist_Block_Customer_Sharing\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Block_Abstract\\)\\) of method Mage_Core_Block_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Wishlist/Block/Customer/Sharing.php + + - + message: "#^Return type \\(void\\) of method Mage_Wishlist_Block_Customer_Wishlist\\:\\:_prepareLayout\\(\\) should be compatible with return type \\(\\$this\\(Mage_Catalog_Block_Product_Abstract\\)\\) of method Mage_Catalog_Block_Product_Abstract\\:\\:_prepareLayout\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php + + - + message: "#^Parameter \\#1 \\$item \\(Mage_Wishlist_Model_Item\\) of method Mage_Wishlist_Block_Share_Email_Items\\:\\:hasDescription\\(\\) should be compatible with parameter \\$item \\(Mage_Catalog_Model_Product\\) of method Mage_Wishlist_Block_Abstract\\:\\:hasDescription\\(\\)$#" count: 1 - path: ../app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php + path: ../app/code/core/Mage/Wishlist/Block/Share/Email/Items.php - message: "#^Method Mage_Wishlist_Model_Item\\:\\:save\\(\\) should return \\$this\\(Mage_Wishlist_Model_Item\\) but return statement is missing\\.$#" @@ -4102,9 +5831,9 @@ parameters: path: ../app/code/core/Mage/Wishlist/Model/Item.php - - message: "#^Call to an undefined method Varien_Object\\:\\:isInStock\\(\\)\\.$#" + message: "#^Method Mage_Wishlist_Model_Item_Option\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Wishlist_Model_Item_Option\\) but should not return anything\\.$#" count: 1 - path: ../app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php + path: ../app/code/core/Mage/Wishlist/Model/Item/Option.php - message: "#^Variable \\$item might not be defined\\.$#" @@ -4115,3 +5844,18 @@ parameters: message: "#^Comparison operation \"\\!\\=\" between int and \\(array\\|string\\) results in an error\\.$#" count: 1 path: ../app/code/core/Mage/Wishlist/controllers/IndexController.php + + - + message: "#^Method Mage_Wishlist_IndexController\\:\\:_addItemToWishList\\(\\) with return type void returns mixed but should not return anything\\.$#" + count: 1 + path: ../app/code/core/Mage/Wishlist/controllers/IndexController.php + + - + message: "#^Method Mage_Wishlist_IndexController\\:\\:downloadCustomOptionAction\\(\\) with return type void returns mixed but should not return anything\\.$#" + count: 3 + path: ../app/code/core/Mage/Wishlist/controllers/IndexController.php + + - + message: "#^Return type \\(void\\) of method Mage_Wishlist_IndexController\\:\\:preDispatch\\(\\) should be compatible with return type \\(\\$this\\(Mage_Core_Controller_Front_Action\\)\\) of method Mage_Core_Controller_Front_Action\\:\\:preDispatch\\(\\)$#" + count: 1 + path: ../app/code/core/Mage/Wishlist/controllers/IndexController.php diff --git a/.github/phpstan.neon b/.github/phpstan.neon index 00369b21ec6..ade4c94d571 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -45,7 +45,7 @@ parameters: # Too much noise from "Variable $this might not be defined" - */app/code/core/*/*/data/* - */app/code/core/*/*/sql/* - level: 2 + level: 3 checkFunctionNameCase: true checkInternalClassCaseSensitivity: true diff --git a/.github/phpstan_experimental_level.neon b/.github/phpstan_experimental_level.neon index 171b987cf48..76a004ba3d4 100644 --- a/.github/phpstan_experimental_level.neon +++ b/.github/phpstan_experimental_level.neon @@ -1,4 +1,9 @@ includes: - phpstan.neon parameters: - level: 3 + paths: + - %currentWorkingDirectory%/app/code/core/Mage + - %currentWorkingDirectory%/lib/Mage + - %currentWorkingDirectory%/lib/Magento + - %currentWorkingDirectory%/lib/Varien + level: 4 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 989b1c74799..90673d04c8b 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -11,7 +11,7 @@ on: jobs: triage: - runs-on: ubuntu-latest + runs-on: [ubuntu-latest] steps: - uses: actions/labeler@main with: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml new file mode 100644 index 00000000000..0e67b9bf619 --- /dev/null +++ b/.github/workflows/phpstan.yml @@ -0,0 +1,54 @@ +name: "PHPStan Static Code Analyses" + +on: + # Run on all pushes and on all pull requests. + # Prevent the build from running when there are only irrelevant changes. + push: + paths: + - '**.php' + pull_request: + paths: + - '**.php' + # Allow manually triggering the workflow. + workflow_dispatch: + +jobs: + php_stan: + runs-on: [ubuntu-latest] + + strategy: + matrix: + config_files: [ + '.github/phpstan.neon', + '.github/phpstan_experimental_level.neon' + ] + + name: PHP Stan ${{ matrix.config_files }} + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Validate composer + run: composer validate --strict + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install dependencies + run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-* + + - name: ensure existance of ./app/code/local + run: mkdir -p app/code/local + + - name: PHPStan Static Analysis + run: php vendor/bin/phpstan.phar analyze -c ${{ matrix.config_files }} + continue-on-error: ${{ matrix.config_files == '.github/phpstan_experimental_level.neon' }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/phpunit.yml similarity index 54% rename from .github/workflows/unit-tests.yml rename to .github/workflows/phpunit.yml index a7d6deb6b7c..92f92825ee7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/phpunit.yml @@ -1,13 +1,20 @@ name: OpenMage LTS - Unit Tests on: + # Run on all pushes and on all pull requests. + # Prevent the build from running when there are only irrelevant changes. push: + paths: + - '**.php' pull_request: + paths: + - '**.php' + # Allow manually triggering the workflow. + workflow_dispatch: jobs: unit-tests: - - runs-on: ubuntu-latest + runs-on: [ubuntu-latest] steps: - uses: actions/checkout@v3 @@ -15,8 +22,19 @@ jobs: repository: OpenMage/Testfield path: ./ - - name: php & Composer version - run: php --version && composer --version + - name: Validate composer + run: composer validate + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- - name: Install dependencies run: composer install --prefer-dist --no-progress --ignore-platform-reqs diff --git a/.github/workflows/security-php.yml b/.github/workflows/security-php.yml new file mode 100644 index 00000000000..6cd27c8b256 --- /dev/null +++ b/.github/workflows/security-php.yml @@ -0,0 +1,27 @@ +name: "PHP Security Check" + +on: + # Run automatically every Monday on midnight. + schedule: + - cron: '0 0 * * 1' + # Run on pull requests only when composer.lock has changed. + pull_request: + paths: + - 'composer.lock' + # Allow manually triggering the workflow. + workflow_dispatch: + +jobs: + check: + runs-on: [ubuntu-latest] + + steps: + - uses: actions/checkout@v3 + + - uses: actions/cache@v2 + id: cache-db + with: + path: ~/.symfony/cache + key: db + + - uses: symfonycorp/security-checker-action@v4 diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 8a9b45b3555..df569949363 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -1,43 +1,61 @@ name: OpenMage LTS - Sonar - Full Analyses on: + # Run on all pushes and on all pull requests. + # Prevent the build from running when there are only irrelevant changes. push: + paths-ignore: + - '**.md' pull_request: + paths-ignore: + - '**.md' types: [opened, synchronize, reopened] - - jobs: unit: - name: Unit Tests on ${{ matrix.php-versions }} - runs-on: ${{ matrix.operating-system }} + name: Unit Tests on ${{ matrix.php }} + runs-on: ${{ matrix.os }} strategy: max-parallel: 5 matrix: - operating-system: [ubuntu-latest] - php-versions: ['7.4', '8.1'] + os: [ubuntu-latest] + php: ['7.4', '8.1'] steps: - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ matrix.php }} extensions: mbstring tools: composer, pecl, phpcs, phpstan, phpunit:9.5 - ini-values-csv: pcov.directory=api, post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration + ini-values: pcov.directory=api, post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration coverage: pcov #optional, setup coverage driver env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Prepare - run: | - php -v - composer --version - composer install --dev -n --prefer-source --ignore-platform-req=php + + - name: Validate composer + run: composer validate --strict + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install dependencies + run: composer install --dev -n --prefer-source --ignore-platform-req=php+ + - name: Run Unit Tests run: phpunit --configuration ./dev/phpunit.xml.dist --testsuite=Unit; + - name: prepare SonarCloud Scan Data continue-on-error: true - if: ${{ matrix.php-versions == '8.1' }} + if: ${{ matrix.php == '8.1' }} run: | echo $PWD ls -la @@ -46,10 +64,11 @@ jobs: sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/clover.xml head ./dev/tests/clover.xml ls -la + - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master continue-on-error: true - if: ${{ matrix.php-versions == '8.1' }} && SONAR_TOKEN + if: ${{ matrix.php == '8.1' }} && SONAR_TOKEN with: args: > -Dproject.settings=dev/sonar-project.properties diff --git a/.github/workflows/static-code-analyses.yml b/.github/workflows/static-code-analyses.yml deleted file mode 100644 index 67768a292b6..00000000000 --- a/.github/workflows/static-code-analyses.yml +++ /dev/null @@ -1,110 +0,0 @@ -name: "Static Code Analyses" -on: - push: - pull_request: - - -jobs: - php_syntax: - name: PHP Syntax ${{ matrix.php-versions }} - runs-on: ${{ matrix.operating-system }} - strategy: - max-parallel: 5 - matrix: - operating-system: [ubuntu-latest] - php-versions: ['7.0', '7.4'] - steps: - - uses: actions/checkout@v3 - - name: Setup PHP - uses: shivammathur/setup-php@master - with: - php-version: ${{ matrix.php-versions }} - extension-csv: mbstring #optional, setup extensions - ini-values-csv: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration - coverage: none #optional, setup coverage driver - pecl: true #optional, setup PECL - - name: Check PHP Version - run: php -v - - name: Check .php files - run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"' - - name: Check .phtml files - run: '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"' - - php_stan: - name: PHP Stan ${{ matrix.directories }} - ${{ matrix.config_files }} - runs-on: [ubuntu-latest] - strategy: - max-parallel: 2 - matrix: - directories: [ - '', - #'lib/', - ] - config_files: [ - '.github/phpstan.neon', - ] - steps: - - uses: actions/checkout@v3 - - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs - - name: ensure existance of ./app/code/local - run: mkdir -p app/code/local - - name: PHPStan Static Analysis - run: php vendor/bin/phpstan.phar analyze -c ${{ matrix.config_files }} ${{ matrix.directories }} - - php_syntax_experimental: - name: PHP Syntax ${{ matrix.php-versions }} - experimental - runs-on: ${{ matrix.operating-system }} - needs: php_syntax - strategy: - max-parallel: 1 - fail-fast: false - matrix: - operating-system: [ubuntu-latest] - php-versions: ['8.0','8.1'] - steps: - - uses: actions/checkout@v3 - - name: Setup PHP - uses: shivammathur/setup-php@master - with: - php-version: ${{ matrix.php-versions }} - extension-csv: mbstring #optional, setup extensions - ini-values-csv: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration - coverage: none #optional, setup coverage driver - pecl: true #optional, setup PECL - - name: Check PHP Version - run: php -v - - name: Check .php files - continue-on-error: true - run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"' - - name: Check .phtml files - continue-on-error: true - run: '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"' - - - php_stan_experimental: - name: PHP Stan ${{ matrix.directories }} - ${{ matrix.config_files }} - experimental - runs-on: [ubuntu-latest] - needs: php_stan - strategy: - max-parallel: 1 - fail-fast: false - matrix: - directories: [ - '' - ] - config_files: [ - '.github/phpstan_experimental_level.neon', - ] - include: - - directories: 'lib/' - config_files: '.github/phpstan.neon' - steps: - - uses: actions/checkout@v3 - - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest --ignore-platform-reqs - - name: ensure existance of ./app/code/local - run: mkdir -p app/code/local - - name: PHPStan Static Analysis - continue-on-error: true - run: php vendor/bin/phpstan.phar analyze --error-format=raw -c ${{ matrix.config_files }} ${{ matrix.directories }} diff --git a/.github/workflows/syntax-php.yml b/.github/workflows/syntax-php.yml new file mode 100644 index 00000000000..c7eb13f2ad2 --- /dev/null +++ b/.github/workflows/syntax-php.yml @@ -0,0 +1,43 @@ +name: "PHP Syntax Check" + +on: + # Run on all pushes and on all pull requests. + # Prevent the build from running when there are only irrelevant changes. + push: + paths: + - '**.php' + - '**.phtml' + pull_request: + paths: + - '**.php' + - '**.phtml' + # Allow manually triggering the workflow. + workflow_dispatch: + +jobs: + php_syntax: + runs-on: [ubuntu-latest] + + strategy: + matrix: + php: ['7.3', '8.1', '8.2'] + + name: PHP Syntax ${{ matrix.php }} + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: mbstring #optional, setup extensions + ini-values: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration + coverage: none #optional, setup coverage driver + + - name: Check .php files + run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"' + + - name: Check .phtml files + run: '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"' diff --git a/.github/workflows/syntax-xml.yml b/.github/workflows/syntax-xml.yml new file mode 100644 index 00000000000..d7f8af924ae --- /dev/null +++ b/.github/workflows/syntax-xml.yml @@ -0,0 +1,30 @@ +name: XML Validation + +on: + # Run on all pushes and on all pull requests. + # Prevent the build from running when there are only irrelevant changes. + push: + paths: + - '**.xml' + pull_request: + paths: + - '**.xml' + # Allow manually triggering the workflow. + workflow_dispatch: + +jobs: + validate: + runs-on: [ubuntu-latest] + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Update APT repositories + run: "sudo apt update" + + - name: Install xmllint + run: "sudo apt-get -y install libxml2-utils" + + - name: Validate XMLs + run: "find . -type f -iname '*.xml' | xargs -I '{}' xmllint --noout '{}'" diff --git a/.github/workflows/xml_validate.yml b/.github/workflows/xml_validate.yml deleted file mode 100644 index d653827dc28..00000000000 --- a/.github/workflows/xml_validate.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: XML Validation - -on: - push: - pull_request: - -jobs: - validate: - runs-on: ubuntu-latest - - steps: - - name: "Checkout repository" - uses: actions/checkout@master - - name: "Update APT repositories" - run: "sudo apt update" - - name: "Install xmllint" - run: "sudo apt-get -y install libxml2-utils" - - name: "Validate XMLs" - run: "find . -type f -iname '*.xml' | xargs -I '{}' xmllint --noout '{}'" diff --git a/.gitignore b/.gitignore index 6bdbef1cb4c..2fc93493a16 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,9 @@ # ddev .ddev/config.yaml + +# scss-cache +/skin/*/*/*/scss/.sass-cache + +# .phar (n98-magerun, ...) +*.phar diff --git a/README.md b/README.md index 2926afbc08c..e2006ef84f5 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@
PHP workflow Badge Sonar workflow badge -Static Code Analyses workflow badge -Unit Tests workflow badge +PHPStan Static Code Analyses workflow badge +PHP Syntax Check workflow badge +Unit Tests workflow badge

# Magento - Long Term Support @@ -19,21 +20,26 @@ level of backwards compatibility to the official releases. **Pull requests with unofficial bug fixes and security patches from the community are encouraged and welcome!** -Though Magento does not follow [Semantic Versioning](http://semver.org/) we aim to provide a workable system for +### Versioning + +Though Magento does __not__ follow [Semantic Versioning](http://semver.org/) we aim to provide a workable system for dependency definition. Each Magento `1..` release will get its own branch (named `1...x`) that will be independently maintained with upstream patches and community bug fixes for as long as it makes sense -to do so (based on available resources). For example, Magento version `1.9.3.4` was merged into the `1.9.3.x` branch. +to do so (based on available resources). For example, Magento version `1.9.4.5` was merged into the `1.9.4.x` branch. ## Requirements -- PHP 7.0+ (PHP 7.3 with OpenSSL extension strongly recommended and verified compatible) (PHP 7.4 and 8.0 are supported) -- MySQL 5.6+ (8.0+ recommended) -- (optional) Redis 5+ (7.x recommended, latest verified compatible 7.0.4 with 20.x) +- PHP 7.3+ (PHP 8.0 is supported) +- MySQL 5.6+ (8.0+ recommended) or MariaDB + +__Please be aware that although OpenMage is compatible that one or more extensions may not be__ + +### Optional -- PHP 7.4 and 8.0 are supported -- Please be aware that although OpenMage is compatible that 1 or more extensions may not be +- Redis 5+ (6.x recommended, latest verified compatible 6.0.7 with 20.x) -If using php 7.2+ then mcrypt needs to be disabled in php.ini or pecl to fallback on mcryptcompat and phpseclib. mcrypt is deprecated from 7.2+ onwards. +### PHP 7.2+ +If using php 7.2+ then `mcrypt` needs to be disabled in `php.ini` or pecl to fallback on `mcryptcompat` and `phpseclib`. `mcrypt` is deprecated from 7.2+ onwards. ## Installation @@ -60,7 +66,7 @@ If you want to contribute to the project: ```bash git init git remote add origin https://github.com//magento-lts -git pull origin master +git pull origin main git remote add upstream https://github.com/OpenMage/magento-lts git pull upstream 1.9.4.x git add -A && git commit @@ -103,6 +109,10 @@ Most important changes will be listed here, all other changes since `19.4.0` can - search for "NULL" in backend grids [#1203](https://github.com/OpenMage/magento-lts/pull/1203) - removed modules `Mage_Compiler`, `Mage_GoogleBase`, `Mage_Xmlconnect`, `Phoenix_Moneybookers` +### Between OpenMage 19.4.18 / 20.0.16 and 19.4.19 / 20.0.17 + +- PHP extension `intl` is required + ### Between OpenMage 19.x and 20.x Do not use 20.x.x if you need IE support. @@ -144,17 +154,50 @@ For full list of changes, you can [compare tags](https://github.com/OpenMage/mag [Full list of events](docs/EVENTS.md) +### Changes to SOAP/WSDL + +Since `19.4.17`/`20.0.15` we changed the `targetNamespace` of all the WSDL files (used in the API modules), from `Magento` to `OpenMage`. +If your custom modules extends OpenMage's APIs with a custom WSDL file and there are some hardcoded `targetNamespace="urn:Magento"` strings, your APIs may stop working. + +Please replace all occurrences of + +``` +targetNamespace="urn:Magento" +``` +with +``` +targetNamespace="urn:OpenMage" +``` +or alternatively +``` +targetNamespace="urn:{{var wsdl.name}}" +``` + to avoid any problem. + +To find which files need the modification you can run this command from the root directory of your project. +``` +grep -rn 'urn:Magento' --include \*.xml +``` + ## Development Environment with ddev - Install [ddev](https://ddev.com/get-started/) -- Clone the repository as described in Installation -> Using Git -- Create a ddev config using ```$ ddev config``` the defaults should be good for you -- Open .ddev/config.yaml and change the php version to 7.2 -- Type ```$ ddev start``` to download and start the containers -- Navigate to https://magento-lts.ddev.site -- When you are done you can stop the test system by typing ```$ ddev stop``` - -### PhpStorm Factory Helper +- Clone the repository as described in installation ([Using Git](https://github.com/OpenMage/magento-lts#using-git)) +- Create a ddev config, defaults should be good for you + ```bash + $ ddev config + ``` +- Open `.ddev/config.yaml` and change the php version to your needs +- Download and start the containers + ```bash + $ ddev start + ``` +- Open your site in browser + ```bash + $ ddev launch + ``` + +## PhpStorm Factory Helper This repo includes class maps for the core Magento files in `.phpstorm.meta.php`. To add class maps for installed extensions, you have to install [N98-magerun](https://github.com/netz98/n98-magerun) diff --git a/api.php b/api.php index 7b5b4976351..c8e2ff60f3c 100644 --- a/api.php +++ b/api.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -if (version_compare(phpversion(), '7.0.0', '<')===true) { - echo 'It looks like you have an invalid PHP version. OpenMage supports PHP 7.0.0 or newer'; +if (version_compare(phpversion(), '7.3.0', '<')===true) { + echo 'It looks like you have an invalid PHP version. OpenMage supports PHP 7.3.0 or newer'; exit; } diff --git a/app/Mage.php b/app/Mage.php index 8f376a92e66..4299ad8a1a5 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ define('DS', DIRECTORY_SEPARATOR); define('PS', PATH_SEPARATOR); -define('BP', dirname(dirname(__FILE__))); +define('BP', dirname(__DIR__)); Mage::register('original_include_path', get_include_path()); @@ -317,8 +318,8 @@ public static function setRoot($appRoot = '') } if ($appRoot === '') { - // automagically find application root by dirname of Mage.php - $appRoot = dirname(__FILE__); + // automagically find application root by __DIR__ constant of Mage.php + $appRoot = __DIR__; } $appRoot = realpath($appRoot); diff --git a/app/bootstrap.php b/app/bootstrap.php index b3fa6660824..d182efd3ec8 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Helper/Block.php b/app/code/core/Mage/Admin/Helper/Block.php index a169b689d43..28be6fc895f 100644 --- a/app/code/core/Mage/Admin/Helper/Block.php +++ b/app/code/core/Mage/Admin/Helper/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,9 +35,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/Data.php b/app/code/core/Mage/Admin/Helper/Data.php index 6689740c339..86b07a4c10e 100644 --- a/app/code/core/Mage/Admin/Helper/Data.php +++ b/app/code/core/Mage/Admin/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +27,8 @@ */ class Mage_Admin_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Admin'; + /** * Configuration path to expiration period of reset password link */ diff --git a/app/code/core/Mage/Admin/Helper/Rules/Fallback.php b/app/code/core/Mage/Admin/Helper/Rules/Fallback.php index 3be93f305fb..2808287ce5f 100644 --- a/app/code/core/Mage/Admin/Helper/Rules/Fallback.php +++ b/app/code/core/Mage/Admin/Helper/Rules/Fallback.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Helper/Variable.php b/app/code/core/Mage/Admin/Helper/Variable.php index 8a65e326329..aff1a2fbfc2 100644 --- a/app/code/core/Mage/Admin/Helper/Variable.php +++ b/app/code/core/Mage/Admin/Helper/Variable.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Admin/Model/Acl.php index 519415c2426..90a12c833b0 100644 --- a/app/code/core/Mage/Admin/Model/Acl.php +++ b/app/code/core/Mage/Admin/Model/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Assert/Ip.php b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php index b0d85567ad1..814c277be1f 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,10 +32,10 @@ class Mage_Admin_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface * Check whether ip is allowed * * @param Mage_Admin_Model_Acl $acl - * @param Mage_Admin_Model_Acl_Role $role - * @param Mage_Admin_Model_Acl_Resource $resource - * @param string $privilege - * @return boolean + * @param Mage_Admin_Model_Acl_Role|null $role + * @param Mage_Admin_Model_Acl_Resource|null $resource + * @param string|null $privilege + * @return bool|null */ public function assert( Mage_Admin_Model_Acl $acl, 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..da8427ac012 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Admin/Model/Acl/Assert/Time.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,10 +32,10 @@ class Mage_Admin_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface * Assert time * * @param Mage_Admin_Model_Acl $acl - * @param Mage_Admin_Model_Acl_Role $role - * @param Mage_Admin_Model_Acl_Resource $resource - * @param string $privilege - * @return boolean + * @param Mage_Admin_Model_Acl_Role|null $role + * @param Mage_Admin_Model_Acl_Resource|null $resource + * @param string|null $privilege + * @return bool|null */ public function assert( Mage_Admin_Model_Acl $acl, diff --git a/app/code/core/Mage/Admin/Model/Acl/Resource.php b/app/code/core/Mage/Admin/Model/Acl/Resource.php index dd8ce4345ad..ddc8f4fd074 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Resource.php +++ b/app/code/core/Mage/Admin/Model/Acl/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Admin/Model/Acl/Role.php index 458048767cc..eadb32cd9d8 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -42,10 +43,6 @@ */ class Mage_Admin_Model_Acl_Role extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('admin/acl_role'); diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php index 3e374160145..2e8fe19ffce 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Generic.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php index 9f3a844f21f..1613be0838a 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Registry.php b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php index 448dc9e1d9d..7616f8b688e 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..e029dc37048 100644 --- a/app/code/core/Mage/Admin/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Admin/Model/Acl/Role/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Block.php b/app/code/core/Mage/Admin/Model/Block.php index 92940d89251..d3fd928f39a 100644 --- a/app/code/core/Mage/Admin/Model/Block.php +++ b/app/code/core/Mage/Admin/Model/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Config.php b/app/code/core/Mage/Admin/Model/Config.php index ba968352643..7cb9e48b1bc 100644 --- a/app/code/core/Mage/Admin/Model/Config.php +++ b/app/code/core/Mage/Admin/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -129,11 +130,7 @@ public function getAclAssert($name = '') return $asserts; } - if (isset($asserts->$name)) { - return $asserts->$name; - } - - return false; + return $asserts->$name ?? false; } /** @@ -149,11 +146,7 @@ public function getAclPrivilegeSet($name = '') return $sets; } - if (isset($sets->$name)) { - return $sets->$name; - } - - return false; + return $sets->$name ?? false; } /** diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php index f408ded8b0f..5037e2f1b4c 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Acl/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php index d654bab4a92..2abe12e7361 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php index 9f08a508afe..09879c62102 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php index 44fc8931e24..72fec5be8b4 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Role.php b/app/code/core/Mage/Admin/Model/Mysql4/Role.php index 57c42ee43c2..4cbf3928b32 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Role/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php index 9349b654770..55a0d1d3a56 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Roles.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php index 26d800d9408..e31a914f399 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php index 720861d0915..039cef3ad8d 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php index dc81205689a..08c1b8db403 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Rules.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php index 43ca4196a5e..4a0e0552900 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php index b8d0c3dd23d..0ac05a4910f 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..317b817a877 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php index 99a380e974c..693e58479c7 100644 --- a/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php index 652b2d07118..72df0e4e7bd 100644 --- a/app/code/core/Mage/Admin/Model/Observer.php +++ b/app/code/core/Mage/Admin/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,8 +65,8 @@ public function actionPreDispatchAdmin($observer) if ($coreSession->validateFormKey($request->getPost("form_key"))) { $postLogin = $request->getPost('login'); - $username = isset($postLogin['username']) ? $postLogin['username'] : ''; - $password = isset($postLogin['password']) ? $postLogin['password'] : ''; + $username = $postLogin['username'] ?? ''; + $password = $postLogin['password'] ?? ''; $session->login($username, $password, $request); $request->setPost('login', null); } else { diff --git a/app/code/core/Mage/Admin/Model/Redirectpolicy.php b/app/code/core/Mage/Admin/Model/Redirectpolicy.php index e786171a00f..7ff35625c4b 100644 --- a/app/code/core/Mage/Admin/Model/Redirectpolicy.php +++ b/app/code/core/Mage/Admin/Model/Redirectpolicy.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,7 +46,7 @@ public function __construct($parameters = []) * Redirect to startup page after logging in if request contains any params (except security key) * * @param Mage_Admin_Model_User $user - * @param Zend_Controller_Request_Http $request + * @param Zend_Controller_Request_Http|null $request * @param string|null $alternativeUrl * @return null|string */ diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl.php b/app/code/core/Mage/Admin/Model/Resource/Acl.php index 704fecffdca..d82fddacbb7 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Acl/Role.php b/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php index 1a14e90ab57..103415d14c3 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl/Role.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,10 +28,6 @@ */ class Mage_Admin_Model_Resource_Acl_Role extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/role', 'role_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php index f8600841658..9db47079048 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..2ad8203a1be 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Block.php +++ b/app/code/core/Mage/Admin/Model/Resource/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,9 +40,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/Block/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php index 6ce7655b790..2d20006d32e 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php index 7e52ec73d14..bece18e1847 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Role.php b/app/code/core/Mage/Admin/Model/Resource/Role.php index e9f0a059132..b907d98986c 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Role.php +++ b/app/code/core/Mage/Admin/Model/Resource/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,6 @@ */ class Mage_Admin_Model_Resource_Role extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/role', 'role_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php index 6810ee9103a..149a1e41d84 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,10 +30,6 @@ */ class Mage_Admin_Model_Resource_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('admin/role'); diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles.php b/app/code/core/Mage/Admin/Model/Resource/Roles.php index 381b927c524..5d3692873ef 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,16 +42,12 @@ 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'); $this->_usersTable = $this->getTable('admin/user'); - $this->_ruleTable = $this->getTable('admin/rule'); + $this->_ruleTable = $this->getTable('admin/rule'); } /** @@ -82,8 +79,10 @@ protected function _beforeSave(Mage_Core_Model_Abstract $role) } else { $treeLevel = 0; } + $role->setTreeLevel($treeLevel + 1); $role->setRoleName($role->getName()); + return $this; } @@ -112,17 +111,8 @@ protected function _afterSave(Mage_Core_Model_Abstract $role) protected function _afterDelete(Mage_Core_Model_Abstract $role) { $adapter = $this->_getWriteAdapter(); - - $adapter->delete( - $this->getMainTable(), - ['parent_id = ?' => (int) $role->getId()] - ); - - $adapter->delete( - $this->_ruleTable, - ['role_id = ?' => (int) $role->getId()] - ); - + $adapter->delete($this->getMainTable(), ['parent_id = ?' => (int) $role->getId()]); + $adapter->delete($this->_ruleTable, ['role_id = ?' => (int) $role->getId()]); return $this; } @@ -134,38 +124,32 @@ protected function _afterDelete(Mage_Core_Model_Abstract $role) */ public function getRoleUsers(Mage_Admin_Model_Roles $role) { - $read = $this->_getReadAdapter(); - - $binds = [ - 'role_id' => $role->getId(), - 'role_type' => 'U' - ]; - - $select = $read->select() + $adapter = $this->_getReadAdapter(); + $select = $adapter->select() ->from($this->getMainTable(), ['user_id']) - ->where('parent_id = :role_id') - ->where('role_type = :role_type') + ->where('parent_id = ?', $role->getId()) + ->where('role_type = ?', Mage_Admin_Model_Acl::ROLE_TYPE_USER) ->where('user_id > 0'); - - return $read->fetchCol($select, $binds); + return $adapter->fetchCol($select); } /** - * Update role users ACL + * Update role users * * @param Mage_Admin_Model_Roles $role * @return bool */ private function _updateRoleUsersAcl(Mage_Admin_Model_Roles $role) { - $write = $this->_getWriteAdapter(); - $users = $this->getRoleUsers($role); + $users = $this->getRoleUsers($role); $rowsCount = 0; if (count($users)) { - $bind = ['reload_acl_flag' => 1]; - $where = ['user_id IN(?)' => $users]; - $rowsCount = $write->update($this->_usersTable, $bind, $where); + $rowsCount = $this->_getWriteAdapter()->update( + $this->_usersTable, + ['reload_acl_flag' => 1], + ['user_id IN (?)' => $users] + ); } return $rowsCount > 0; diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php index e1cae9eaa1a..6b03ebc1847 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,18 +28,12 @@ */ class Mage_Admin_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('admin/role'); } /** - * Init select - * * @return $this */ protected function _initSelect() diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php index 03759dd95ad..f8fa498222b 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,18 +28,12 @@ */ class Mage_Admin_Model_Resource_Roles_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('admin/user'); } /** - * Initialize select - * * @return $this */ protected function _initSelect() diff --git a/app/code/core/Mage/Admin/Model/Resource/Rules.php b/app/code/core/Mage/Admin/Model/Resource/Rules.php index 3b3997e52dc..21b848be6cc 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Rules.php +++ b/app/code/core/Mage/Admin/Model/Resource/Rules.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,6 @@ */ class Mage_Admin_Model_Resource_Rules extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('admin/rule', 'rule_id'); diff --git a/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php index 36aa93a7fd5..85a61698cae 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,10 +30,6 @@ */ class Mage_Admin_Model_Resource_Rules_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('admin/rules'); diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php index c4fda8de925..de9204e97b5 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User.php +++ b/app/code/core/Mage/Admin/Model/Resource/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,18 +28,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() @@ -224,13 +219,11 @@ public function delete(Mage_Core_Model_Abstract $user) public function _saveRelations(Mage_Core_Model_Abstract $user) { $rolesIds = $user->getRoleIds(); - if (!is_array($rolesIds) || count($rolesIds) == 0) { return $user; } $adapter = $this->_getWriteAdapter(); - $adapter->beginTransaction(); try { @@ -242,23 +235,28 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) foreach ($rolesIds as $rid) { $rid = intval($rid); if ($rid > 0) { - $row = Mage::getModel('admin/role')->load($rid)->getData(); + $role = Mage::getModel('admin/role')->load($rid); } else { - $row = ['tree_level' => 0]; + $role = new Varien_Object(['tree_level' => 0]); } $data = new Varien_Object([ - 'parent_id' => $rid, - 'tree_level' => $row['tree_level'] + 1, - 'sort_order' => 0, - 'role_type' => 'U', - 'user_id' => $user->getId(), - 'role_name' => $user->getFirstname() + 'parent_id' => $rid, + 'tree_level' => $role->getTreeLevel() + 1, + 'sort_order' => 0, + 'role_type' => Mage_Admin_Model_Acl::ROLE_TYPE_USER, + 'user_id' => $user->getId(), + 'role_name' => $user->getFirstname() ]); $insertData = $this->_prepareDataForTable($data, $this->getTable('admin/role')); $adapter->insert($this->getTable('admin/role'), $insertData); } + + if ($user->getId() > 0) { + // reload acl on next user http request + $this->saveReloadAclFlag($user, 1); + } $adapter->commit(); } catch (Mage_Core_Exception $e) { $adapter->rollBack(); @@ -283,10 +281,9 @@ public function getRoles(Mage_Core_Model_Abstract $user) return []; } - $table = $this->getTable('admin/role'); - $adapter = $this->_getReadAdapter(); - - $select = $adapter->select() + $table = $this->getTable('admin/role'); + $adapter = $this->_getReadAdapter(); + $select = $adapter->select() ->from($table, []) ->joinLeft( ['ar' => $table], @@ -317,38 +314,39 @@ public function getRoles(Mage_Core_Model_Abstract $user) public function add(Mage_Core_Model_Abstract $user) { $dbh = $this->_getWriteAdapter(); - $aRoles = $this->hasAssigned2Role($user); if (count($aRoles)) { foreach ($aRoles as $idx => $data) { - $conditions = [ - 'role_id = ?' => $data['role_id'], - ]; - - $dbh->delete($this->getTable('admin/role'), $conditions); + $dbh->delete( + $this->getTable('admin/role'), + ['role_id = ?' => $data['role_id']] + ); } } if ($user->getId() > 0) { $role = Mage::getModel('admin/role')->load($user->getRoleId()); } else { - $role = new Varien_Object(); - $role->setTreeLevel(0); + $role = new Varien_Object(['tree_level' => 0]); } $data = new Varien_Object([ 'parent_id' => $user->getRoleId(), - 'tree_level' => ($role->getTreeLevel() + 1), + 'tree_level' => $role->getTreeLevel() + 1, 'sort_order' => 0, - 'role_type' => 'U', + 'role_type' => Mage_Admin_Model_Acl::ROLE_TYPE_USER, 'user_id' => $user->getUserId(), 'role_name' => $user->getFirstname() ]); $insertData = $this->_prepareDataForTable($data, $this->getTable('admin/role')); - $dbh->insert($this->getTable('admin/role'), $insertData); + if ($user->getId() > 0) { + // reload acl on next user http request + $this->saveReloadAclFlag($user, 1); + } + return $this; } @@ -382,7 +380,7 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user) * Check if role user exists * * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user - * @return array|false + * @return array */ public function roleUserExists(Mage_Core_Model_Abstract $user) { @@ -415,7 +413,7 @@ public function roleUserExists(Mage_Core_Model_Abstract $user) public function userExists(Mage_Core_Model_Abstract $user) { $adapter = $this->_getReadAdapter(); - $select = $adapter->select(); + $select = $adapter->select(); $binds = [ 'username' => $user->getUsername(), @@ -465,6 +463,13 @@ public function saveReloadAclFlag($object, $flag) ['reload_acl_flag' => $flag], ['user_id = ?' => (int) $object->getId()] ); + if ($flag) { + // refresh cache menu + Mage::app()->getCache()->clean( + Zend_Cache::CLEANING_MODE_MATCHING_TAG, + [Mage_Adminhtml_Block_Page_Menu::CACHE_TAGS] + ); + } } return $this; diff --git a/app/code/core/Mage/Admin/Model/Resource/User/Collection.php b/app/code/core/Mage/Admin/Model/Resource/User/Collection.php index 928201e2bb8..f6a5d93116b 100644 --- a/app/code/core/Mage/Admin/Model/Resource/User/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Variable.php b/app/code/core/Mage/Admin/Model/Resource/Variable.php index 557b40ab8b7..4d00eadc018 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Variable.php +++ b/app/code/core/Mage/Admin/Model/Resource/Variable.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,22 +28,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/Resource/Variable/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php index d05b848e8ec..0818009e9fa 100644 --- a/app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php +++ b/app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/Model/Role.php b/app/code/core/Mage/Admin/Model/Role.php index ac9b68e6e99..d325039df91 100644 --- a/app/code/core/Mage/Admin/Model/Role.php +++ b/app/code/core/Mage/Admin/Model/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Roles.php b/app/code/core/Mage/Admin/Model/Roles.php index 83b82d05ba5..ed28585a768 100644 --- a/app/code/core/Mage/Admin/Model/Roles.php +++ b/app/code/core/Mage/Admin/Model/Roles.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,9 +52,6 @@ class Mage_Admin_Model_Roles extends Mage_Core_Model_Abstract */ protected $_eventPrefix = 'admin_roles'; - /** - * Constructor - */ protected function _construct() { $this->_init('admin/roles'); diff --git a/app/code/core/Mage/Admin/Model/Rules.php b/app/code/core/Mage/Admin/Model/Rules.php index e9b75f5aa7e..552c1907e9c 100644 --- a/app/code/core/Mage/Admin/Model/Rules.php +++ b/app/code/core/Mage/Admin/Model/Rules.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php index f4be2aa4491..5c8c6da447f 100644 --- a/app/code/core/Mage/Admin/Model/Session.php +++ b/app/code/core/Mage/Admin/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,7 +63,7 @@ class Mage_Admin_Model_Session extends Mage_Core_Model_Session_Abstract /** * Whether it is the first page after successfull login * - * @var boolean + * @var bool */ protected $_isFirstPageAfterLogin; @@ -189,7 +190,7 @@ public function login($username, $password, $request = null) $this->_loginFailed($e, $request, $username, $message); } - return isset($user) ? $user : null; + return $user ?? null; } /** @@ -223,7 +224,7 @@ public function refreshAcl($user = null) * * @param string $resource * @param string $privilege - * @return boolean + * @return bool */ public function isAllowed($resource, $privilege = null) { @@ -252,7 +253,7 @@ public function isAllowed($resource, $privilege = null) /** * Check if user is logged in * - * @return boolean + * @return bool */ public function isLoggedIn() { @@ -262,7 +263,7 @@ public function isLoggedIn() /** * Check if it is the first page after successfull login * - * @return boolean + * @return bool */ public function isFirstPageAfterLogin() { diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php index 9b8f0a702d0..ffeaba06d3c 100644 --- a/app/code/core/Mage/Admin/Model/User.php +++ b/app/code/core/Mage/Admin/Model/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -126,7 +127,7 @@ class Mage_Admin_Model_User extends Mage_Core_Model_Abstract /** * Available resources flag * - * @var boolean + * @var bool */ protected $_hasAvailableResources = true; @@ -263,7 +264,7 @@ public function deleteFromRole() /** * Check if such combination role/user exists * - * @return boolean + * @return bool */ public function roleUserExists() { @@ -285,7 +286,7 @@ public function add() /** * Check if user exists based on its id, username and email * - * @return boolean + * @return bool */ public function userExists() { @@ -375,7 +376,7 @@ public function getAclRole() * * @param string $username * @param string $password - * @return boolean + * @return bool * @throws Mage_Core_Exception */ public function authenticate($username, $password) @@ -471,7 +472,7 @@ public function loadByUsername($username) * Check if user is assigned to any role * * @param int|Mage_Admin_Model_User $user - * @return null|boolean|array + * @return array|null */ public function hasAssigned2Role($user) { @@ -505,7 +506,7 @@ protected function _getHelper($helperName) * * @param Mage_Core_Model_Config_Element $parent * @param string $path - * @param integer $level + * @param int $level * @return string */ public function findFirstAvailableMenu($parent = null, $path = '', $level = 0) @@ -682,7 +683,7 @@ public function changeResetPasswordLinkToken($newResetPasswordLinkToken) /** * Check if current reset password link token is expired * - * @return boolean + * @return bool */ public function isResetPasswordLinkTokenExpired() { @@ -727,7 +728,7 @@ public function cleanPasswordsValidationData() /** * Simple sql format date * - * @param string|boolean $dayOnly + * @param string|bool $dayOnly * @return string */ protected function _getDateNow($dayOnly = false) diff --git a/app/code/core/Mage/Admin/Model/Variable.php b/app/code/core/Mage/Admin/Model/Variable.php index f1787269671..92fea8d0625 100644 --- a/app/code/core/Mage/Admin/Model/Variable.php +++ b/app/code/core/Mage/Admin/Model/Variable.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/data/admin_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php index 9c2585b755f..b5b86e6be12 100644 --- a/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/etc/config.xml b/app/code/core/Mage/Admin/etc/config.xml index b0c08eafae7..d60e3d7e7e4 100644 --- a/app/code/core/Mage/Admin/etc/config.xml +++ b/app/code/core/Mage/Admin/etc/config.xml @@ -8,15 +8,16 @@ * 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_Admin - * @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_Admin + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php index f2c581a8c8d..2d381bd3cbf 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Admin - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php index 89f1bcffbf4..eb24278f9b1 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php index 9d5651039c4..4800badb71a 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('admin/user'), 'extra', 'TEXT NULL'); diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php index 8580b87b164..3d362b69fa5 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $tableAdmins = $installer->getTable('admin/user'); diff --git a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 1c92d6b97cc..06c3ada373c 100644 --- a/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.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..3bb7bc1d7f6 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..1bb2284c2fc 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..4691963b09b 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..04436aba702 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Helper/Data.php b/app/code/core/Mage/AdminNotification/Helper/Data.php index bbda2f0fc42..3d80a291e0a 100644 --- a/app/code/core/Mage/AdminNotification/Helper/Data.php +++ b/app/code/core/Mage/AdminNotification/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_AdminNotification_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_AdminNotification'; + /** * Last Notice object * @@ -65,7 +68,7 @@ public function getUnreadNoticeCount($severity) if (is_null($this->_unreadNoticeCounts)) { $this->_unreadNoticeCounts = Mage::getModel('adminnotification/inbox')->getNoticeStatus(); } - return isset($this->_unreadNoticeCounts[$severity]) ? $this->_unreadNoticeCounts[$severity] : 0; + return $this->_unreadNoticeCounts[$severity] ?? 0; } /** diff --git a/app/code/core/Mage/AdminNotification/Model/Feed.php b/app/code/core/Mage/AdminNotification/Model/Feed.php index f1f35fc2e28..da5f256edd2 100644 --- a/app/code/core/Mage/AdminNotification/Model/Feed.php +++ b/app/code/core/Mage/AdminNotification/Model/Feed.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -103,7 +104,7 @@ public function checkUpdate() */ public function getDate($rssDate) { - return gmdate('Y-m-d H:i:s', strtotime($rssDate)); + return gmdate(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($rssDate)); } /** diff --git a/app/code/core/Mage/AdminNotification/Model/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Inbox.php index 129bb067a73..e3823bf778d 100644 --- a/app/code/core/Mage/AdminNotification/Model/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Inbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,10 +72,7 @@ public function getSeverities($severity = null) ]; if (!is_null($severity)) { - if (isset($severities[$severity])) { - return $severities[$severity]; - } - return null; + return $severities[$severity] ?? null; } return $severities; @@ -131,7 +129,7 @@ public function add($severity, $title, $description, $url = '', $isInternal = tr if (is_array($description)) { $description = '
  • ' . implode('
  • ', $description) . '
'; } - $date = date('Y-m-d H:i:s'); + $date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT); $this->parse([[ 'severity' => $severity, 'date_added' => $date, diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php index 085f65e8b45..54081aeeb80 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php index 38ce41c6828..2e80171ce60 100644 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +++ b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Observer.php b/app/code/core/Mage/AdminNotification/Model/Observer.php index c4828c07004..2de1a77e06f 100644 --- a/app/code/core/Mage/AdminNotification/Model/Observer.php +++ b/app/code/core/Mage/AdminNotification/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_AdminNotification - * @author Magento Core Team + * @author Magento Core Team */ class Mage_AdminNotification_Model_Observer { diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php index 0f7404f7235..f1aad51de83 100644 --- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php index f5b8d100d8e..df5fe4ceeea 100644 --- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php +++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml b/app/code/core/Mage/AdminNotification/etc/adminhtml.xml index d39deb8a451..555bf8fddbd 100644 --- a/app/code/core/Mage/AdminNotification/etc/adminhtml.xml +++ b/app/code/core/Mage/AdminNotification/etc/adminhtml.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. (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/AdminNotification/etc/config.xml b/app/code/core/Mage/AdminNotification/etc/config.xml index 80bae5ca303..bf8871fb742 100644 --- a/app/code/core/Mage/AdminNotification/etc/config.xml +++ b/app/code/core/Mage/AdminNotification/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> @@ -86,6 +87,7 @@ www.openmage.org/Web_Notifications/notifications_v1.rss + widgets.magentocommerce.com/%s/%s.gif 1 1 0 diff --git a/app/code/core/Mage/AdminNotification/etc/system.xml b/app/code/core/Mage/AdminNotification/etc/system.xml index b4cd1c29517..eace6dfc3b7 100644 --- a/app/code/core/Mage/AdminNotification/etc/system.xml +++ b/app/code/core/Mage/AdminNotification/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php index 69678c2d8ea..2f0b95bb853 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php index 16958916a81..7319561ae35 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('adminnotification_inbox')}`; CREATE TABLE IF NOT EXISTS `{$installer->getTable('adminnotification_inbox')}` ( diff --git a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index dfb434418fb..be18ade2926 100644 --- a/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_AdminNotification + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Adminhtml/Block/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Abstract.php index e9c0fb11357..a8b787fb1fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php index b7b51e084f3..039a63b9587 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Buttons.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php index 3fcc7646469..d4f4c803b97 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Editroles.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php index 9bd6b2d2b0b..d48e6c59186 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Edituser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php index 86f7c8053c7..edee2e1f0a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Role.php b/app/code/core/Mage/Adminhtml/Block/Api/Role.php index c273c46fc77..bb80928cd85 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Role.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Api_Role extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'api_role'; @@ -36,5 +34,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('adminhtml')->__('Add New Role'); parent::__construct(); } - } 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..ed8823bbaab 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,9 +30,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/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php index 8ae1161ade7..9fed094e28f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Roles.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php index 97510d3f323..0feabcd24a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * implementing now - * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Api_Tab_Roleinfo extends Mage_Adminhtml_Block_Widget_Form { diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php index 1185d1bf4d1..1466b94d907 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Rolesedit extends Mage_Adminhtml_Block_Widget_Form { public function __construct() { @@ -59,7 +65,7 @@ public function getResTreeJson() $rootArray = $this->_getNodeJson($resources,1); - return Mage::helper('core')->jsonEncode(isset($rootArray['children']) ? $rootArray['children'] : []); + return Mage::helper('core')->jsonEncode($rootArray['children'] ?? []); } protected function _sortTree($a, $b) diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php index 4b5594d7f3b..9eee5a919b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() @@ -47,5 +52,4 @@ protected function _getJsObjectName() { return $this->getChild('userGrid')->getJsObjectName(); } - } 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..796f7d6599a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..01673946249 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php index d191ef27887..49f156683ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php index e737ffdf5a2..b353c231fc5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php index b67b1768ef3..b64e76ba334 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Api_User_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $model = Mage::registry('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 654d8c8ec6d..f91c51955c6 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 @@ -7,25 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_Role_Collection getCollection() */ class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -46,8 +50,7 @@ protected function _addColumnFilterToCollection($column) } if ($column->getFilter()->getValue()) { $this->getCollection()->addFieldToFilter('role_id', ['in'=>$userRoles]); - } - elseif ($userRoles) { + } elseif ($userRoles) { $this->getCollection()->addFieldToFilter('role_id', ['nin'=>$userRoles]); } } 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..313fbb3aa7d 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php index 95607f9db3f..ee7e50cf60f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..b3011a76aa5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Api/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Api/Users.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Backup.php b/app/code/core/Mage/Adminhtml/Block/Backup.php index 68e0e5f5fea..2df4320fe75 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php index ef2b2331057..4fe84915bd5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php index b7d83e50964..3bd7e80ed49 100644 --- a/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Backup/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,7 +79,6 @@ protected function _prepareColumns() 'header' => Mage::helper('backup')->__('Time'), 'index' => 'date_object', 'type' => 'datetime', - 'width' => 200 ]); $this->addColumn('display_name', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache.php b/app/code/core/Mage/Adminhtml/Block/Cache.php index 64b6ff93efa..8ec56f7ac3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php b/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php index 18a0f98c075..870018683b0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Additional.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php index 1ba7fa42779..86ff211d91d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php b/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php index 7138cc25308..abdde3e9fee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php +++ b/app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Cache_Notifications extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Catalog.php index e8fc7613b61..1e8499fbbc5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php index aca702c7580..2cea566c0a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Checkboxes/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php index b0fd6d96394..4c0a212097c 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 @@ -7,20 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php index b21ebf097d4..02b281728f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php index e3f07978add..6c88f492b56 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php index 920c6f199f6..b40fafbec4c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php index 23ae9549b3e..a2796fa791e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php index e2d53a889cb..34cd334b166 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php index 25df86d298f..131b09d2260 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php index e36b4d3c901..2c7552b0fca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php index cf414ffa7af..9d078a0be7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,12 +26,23 @@ */ class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form { + /** + * @var Mage_Catalog_Model_Category + */ + protected $_category; + + /** + * Mage_Adminhtml_Block_Catalog_Category_Tab_Design constructor. + */ public function __construct() { parent::__construct(); $this->setShowGlobalIcon(true); } + /** + * @return Mage_Catalog_Model_Category + */ public function getCategory() { if (!$this->_category) { @@ -39,6 +51,9 @@ public function getCategory() return $this->_category; } + /** + * @return $this + */ public function _prepareLayout() { parent::_prepareLayout(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php index 6c39e95141c..f7df3adb07e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php index e8667babe23..a078cb21c33 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php index 5c68c72e87c..f0f3e473a3b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..60146120070 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Catalog_Category_Abstract { - protected $_withProductCount; public function __construct() @@ -163,13 +163,13 @@ public function getMoveUrl() public function getTree($parenNodeCategory=null) { $rootArray = $this->_getNodeJson($this->getRoot($parenNodeCategory)); - return isset($rootArray['children']) ? $rootArray['children'] : []; + return $rootArray['children'] ?? []; } public function getTreeJson($parenNodeCategory=null) { $rootArray = $this->_getNodeJson($this->getRoot($parenNodeCategory)); - return Mage::helper('core')->jsonEncode(isset($rootArray['children']) ? $rootArray['children'] : []); + return Mage::helper('core')->jsonEncode($rootArray['children'] ?? []); } /** @@ -301,7 +301,7 @@ protected function _isParentSelectedCategory($node) /** * Check if page loaded by outside link to category edit * - * @return boolean + * @return bool */ public function isClearEdit() { @@ -311,7 +311,7 @@ public function isClearEdit() /** * Check availability of adding root category * - * @return boolean + * @return bool */ public function canAddRootCategory() { @@ -331,7 +331,7 @@ public function canAddRootCategory() /** * Check availability of adding sub category * - * @return boolean + * @return bool */ public function canAddSubCategory() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php index 9633e7990c8..90097aa57c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php index df690565fd0..d68f7d15dc8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php index f4a790b921c..c3e0c1f6965 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,7 +27,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/DateFieldsOrder.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php index 4ec0a1c1bb3..f2f0da38d5c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,9 +47,9 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) } $_parts = []; - $_parts[] = $element->setValue(isset($values[0]) ? $values[0] : null)->getElementHtml(); - $_parts[] = $element->setValue(isset($values[1]) ? $values[1] : null)->getElementHtml(); - $_parts[] = $element->setValue(isset($values[2]) ? $values[2] : null)->getElementHtml(); + $_parts[] = $element->setValue($values[0] ?? null)->getElementHtml(); + $_parts[] = $element->setValue($values[1] ?? null)->getElementHtml(); + $_parts[] = $element->setValue($values[2] ?? null)->getElementHtml(); return implode(' / ', $_parts); } 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..faf29eebd03 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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;') @@ -39,8 +39,8 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) $values = []; } - $from = $element->setValue(isset($values[0]) ? $values[0] : null)->getElementHtml(); - $to = $element->setValue(isset($values[1]) ? $values[1] : null)->getElementHtml(); + $from = $element->setValue($values[0] ?? null)->getElementHtml(); + $to = $element->setValue($values[1] ?? null)->getElementHtml(); return Mage::helper('adminhtml')->__('from') . ' ' . $from . ' ' . Mage::helper('adminhtml')->__('to') . ' ' . $to; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php index 5ee04785134..ae61614406e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -186,7 +187,7 @@ public function getElementHtml() /** * Default sore ID getter * - * @return integer + * @return int */ protected function _getDefaultStoreId() { 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..101b836f701 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,7 +53,7 @@ public function getAfterElementHtml() /** * Check whether wysiwyg enabled or not * - * @return boolean + * @return bool */ public function getIsWysiwygEnabled() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php index 6b7b4fbfef0..2a194c84956 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php index cfe1be7f0c9..9f1edb755b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,9 +38,7 @@ public function __construct() } /** - * Prepare button and grid - * - * @return $this + * @inheritDoc */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php index 359a8e4ce7b..b79172a1952 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php index a761bced887..533df35d097 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php index 4e8c17534b9..2080982f2e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index 22bb21aeb8a..ab565626f0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php index 50a608ff27c..dadf7bebd3a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php index 214fb5eb66e..558234aaf7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..f78bdcdc57e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,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 +123,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..f8da4d2e777 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -63,5 +63,4 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php index 3927b7a80e8..de310065923 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/New/Product/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php index d070a9dd9e0..552b0d9c023 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php index b037ff1f64a..1380d9c204d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php index 8c81934cc69..0d4b3d60890 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php index 6bb130057ac..97d1ae51499 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php index fa2e899f4dd..62c68081e27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php index bda15649358..7cd6cd3bdd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php index 2883c9402a5..1eaa9d026a2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php index 3d194de3085..78f0cf0a00f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php index e6e581fd6f0..ec7f34cc074 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php index fe06da4c675..314f4852420 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 @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php index 5cc9bd3716b..9947bbe822e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main extends Mage_Adminhtml_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php index 648b5d51292..36c2518f887 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php index cc939c06dba..47b930d8351 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +58,7 @@ public function getProduct() /** * Set product object * - * @param Mage_Catalog_Model_Product $product + * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(Mage_Catalog_Model_Product $product = null) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php index 6c1a9c44738..d59b1621234 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php index 7a1f742237b..5e360c62a74 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php index dfd925d33a2..fb223186b20 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php index 551da87631b..93c97c9c622 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +73,9 @@ public function getProduct() public function getAssociatedProducts() { $product = $this->getProduct(); - $result = $product->getTypeInstance(true)->getAssociatedProducts($product); + /** @var Mage_Catalog_Model_Product_Type_Grouped $productType */ + $productType = $product->getTypeInstance(true); + $result = $productType->getAssociatedProducts($product); $storeId = $product->getStoreId(); foreach ($result as $item) { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php index 6988549e1eb..00c28b416ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Options extends Mage_Catalog_Block_Product_View_Options { - /** - * Constructor for our block with options - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php index 9fe99a04085..01216a65ca6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Qty extends Mage_Core_Block_Template { - /** - * Constructor for our block with options - */ public function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php index 4597ed4ca85..5da1e4ca913 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php index dfe43b2e709..81f280852e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,7 +63,7 @@ public function getProductId() /** * Indentifies edit mode of popup * - * @return boolean + * @return bool */ public function isEdit() { @@ -93,7 +94,9 @@ public function getAttributesJson() public function getAttributes() { if ($this->getConfigurableProduct()->getId()) { - return $this->getConfigurableProduct()->getTypeInstance(true)->getUsedProductAttributes($this->getConfigurableProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->getConfigurableProduct()->getTypeInstance(true); + return $productType->getUsedProductAttributes($this->getConfigurableProduct()); } $attributes = []; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php index bf1e2c5ee0c..ba5eb8d544f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -234,15 +235,18 @@ public function getAttributeSetName() public function getIsConfigured() { - if ($this->getProduct()->isConfigurable() - && !($superAttributes = $this->getProduct() - ->getTypeInstance(true) - ->getUsedProductAttributeIds($this->getProduct())) - ) { - $superAttributes = false; + $superAttributes = true; + $product = $this->getProduct(); + if ($product->isConfigurable()) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $superAttributes = $productType->getUsedProductAttributeIds($product); + if (!$superAttributes) { + $superAttributes = false; + } } - return !$this->getProduct()->isConfigurable() || $superAttributes !== false; + return !$product->isConfigurable() || $superAttributes !== false; } public function getSelectedTabId() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php index f81d3de9946..33903c3fc5a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php index 8e16c3e42aa..7fbe4a6f702 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php index 230a22b4048..8c15f776950 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Tab/Websites.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php index 1e7caa9a0a9..56f15954f02 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..31ff27e3e60 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Js.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php index 7224c3c74d7..17bcd79ec2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Js extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php index e70a6adb10d..3188579ebb6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php index 400336d5d79..e7d898af79d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php index 0fcdc3ee588..55ca43041fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..d302ef96a2f 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php index ab228bf3371..d15d4ac470a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Attributes/Create.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php index 1a8f6649f44..3e3dee30120 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Categories.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php index ca3473c3151..4381996c00a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +53,7 @@ public function getProduct() /** * Checks when this block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index fa3c1126c13..077e912c4e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -109,7 +110,7 @@ protected function _prepareCollection() /** * Checks when this block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php index bdc76eb6960..1351708dac8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product inventory data * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Inventory extends Mage_Adminhtml_Block_Widget { @@ -107,7 +110,7 @@ public function getDefaultConfigValue($field) /** * Is readonly stock * - * @return boolean + * @return bool */ public function isReadonly() { @@ -140,7 +143,7 @@ public function canUseQtyDecimals() /** * Check if product type is virtual * - * @return boolean + * @return bool */ public function isVirtual() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php index 8efbc4e9c46..e81b39536bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options extends Mage_Adminhtml_Block_Widget { public function __construct() @@ -61,5 +61,4 @@ public function getOptionsBoxHtml() { return $this->getChildHtml('options_box'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php index 56635cf9332..1c7be0653c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Option extends Mage_Adminhtml_Block_Widget { protected $_product; @@ -105,7 +105,7 @@ public function getFieldId() /** * Check block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { @@ -296,7 +296,7 @@ public function getOptionValues() * * @param string $id * @param string $name - * @param boolean $checked + * @param bool $checked * @param string $select_id * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php index 053c66aa65e..e88d8b56347 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Date.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php index 240459960eb..0735cb83c27 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/File.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php index f53ffd3ff9b..a378c004b22 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Select.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php index cfb1055d27c..d38a681e1c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Select extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Options_Type_Abstract { 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..030dce9cfae 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php index 6eb73576395..b9fabef96c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Price/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php index 07d1d229c77..67f9a775e5f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Price/Group/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php index 2b82b87d7b0..5bd97e7de99 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -150,7 +151,7 @@ public function getCustomerGroups($groupId = null) } if ($groupId !== null) { - return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : []; + return $this->_customerGroups[$groupId] ?? []; } return $this->_customerGroups; diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php index ffc533db6d6..752fa75a0bf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profile attribute edit renderer + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Price_Recurring extends Mage_Adminhtml_Block_Catalog_Form_Renderer_Fieldset_Element 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..122448bf48e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,10 +29,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/Related.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php index 3e5476f214c..13fc45c095e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -109,7 +110,7 @@ protected function _prepareCollection() /** * Checks when this block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php index ef47aadeced..3c15a440f5e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Settings.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php index bc37987ac3c..5ebdc0d3c2e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php index 0d6ef6f4800..dab3136402c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +56,7 @@ public function getTabClass() /** * Check block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { @@ -65,7 +66,7 @@ public function isReadonly() /** * Check whether attributes of configurable products can be editable * - * @return boolean + * @return bool */ public function isAttributesConfigurationReadonly() { @@ -75,7 +76,7 @@ public function isAttributesConfigurationReadonly() /** * Check whether prices of configurable products can be editable * - * @return boolean + * @return bool */ public function isAttributesPricesReadonly() { @@ -140,8 +141,9 @@ protected function _getProduct() */ public function getAttributesJson() { - $attributes = $this->_getProduct()->getTypeInstance(true) - ->getConfigurableAttributesAsArray($this->_getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + $attributes = $productType->getConfigurableAttributesAsArray($this->_getProduct()); if(!$attributes) { return '[]'; } else { @@ -172,9 +174,10 @@ public function getAttributesJson() */ public function getLinksJson() { - $products = $this->_getProduct()->getTypeInstance(true) - ->getUsedProducts(null, $this->_getProduct()); - if(!$products) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + $products = $productType->getUsedProducts(null, $this->_getProduct()); + if (!$products) { return '{}'; } $data = []; @@ -192,8 +195,9 @@ public function getLinksJson() */ public function getConfigurableSettings($product) { $data = []; - $attributes = $this->_getProduct()->getTypeInstance(true) - ->getUsedProductAttributes($this->_getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + $attributes = $productType->getUsedProductAttributes($this->_getProduct()); foreach ($attributes as $attribute) { $data[] = [ 'attribute_id' => $attribute->getId(), @@ -285,8 +289,9 @@ public function getQuickCreationUrl() protected function _getRequiredAttributesIds() { $attributesIds = []; - $configurableAttributes = $this->_getProduct() - ->getTypeInstance(true)->getConfigurableAttributes($this->_getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + $configurableAttributes = $productType->getConfigurableAttributes($this->_getProduct()); foreach ($configurableAttributes as $attribute) { $attributesIds[] = $attribute->getProductAttribute()->getId(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php index 14e4608f669..ca6288e9d3c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,8 +139,10 @@ protected function _prepareCollection() if (Mage::helper('catalog')->isModuleEnabled('Mage_CatalogInventory')) { Mage::getModel('cataloginventory/stock_item')->addCatalogInventoryToProductCollection($collection); } + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); - foreach ($product->getTypeInstance(true)->getUsedProductAttributes($product) as $attribute) { + foreach ($productType->getUsedProductAttributes($product) as $attribute) { $collection->addAttributeToSelect($attribute->getAttributeCode()); $collection->addAttributeToFilter($attribute->getAttributeCode(), ['notnull'=>1]); } @@ -158,7 +161,9 @@ protected function _getSelectedProducts() { $products = $this->getRequest()->getPost('products', null); if (!is_array($products)) { - $products = $this->_getProduct()->getTypeInstance(true)->getUsedProductIds($this->_getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + $products = $productType->getUsedProductIds($this->_getProduct()); } return $products; } @@ -183,7 +188,9 @@ public function isReadonly() protected function _prepareColumns() { $product = $this->_getProduct(); - $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $attributes = $productType->getConfigurableAttributes($product); if (!$this->isReadonly()) { $this->addColumn('in_products', [ @@ -297,11 +304,9 @@ public function getEditParamsForAssociated() protected function _getRequiredAttributesIds() { $attributesIds = []; - foreach ( - $this->_getProduct() - ->getTypeInstance(true) - ->getConfigurableAttributes($this->_getProduct()) as $attribute - ) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + foreach ($productType->getConfigurableAttributes($this->_getProduct()) as $attribute) { $attributesIds[] = $attribute->getProductAttribute()->getId(); } @@ -333,7 +338,9 @@ protected function _getConfigAttributeCodes() { if (is_null($this->_configAttributeCodes)) { $product = $this->_getProduct(); - $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $attributes = $productType->getConfigurableAttributes($product); $attributeCodes = []; foreach ($attributes as $attribute) { $productAttribute = $attribute->getProductAttribute(); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php index 6806c755f5b..88ee3b871bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,9 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Filter_Inventory extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - + /** + * @return array + */ protected function _getOptions() { return [ @@ -45,5 +48,4 @@ protected function _getOptions() ] ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php index 07294c7ed5f..9a6615cab18 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Renderer/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php index 3d7efa6939d..9ece193598c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,5 +41,4 @@ public function render(Varien_Object $row) Mage::helper('catalog')->__('In Stock') : Mage::helper('catalog')->__('Out of Stock'); } - } 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..1e3e6e0125c 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,45 +59,47 @@ protected function _prepareForm() ->setAttributeSetId($this->_getProduct()->getAttributeSetId()) ->getAttributes(); - /* Standart attributes */ + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + $usedAttributes = $productType->getUsedProductAttributes($this->_getProduct()); + + /* Standard attributes */ foreach ($attributes as $attribute) { + $attributeCode = $attribute->getAttributeCode(); if (($attribute->getIsRequired() - && $attribute->getApplyTo() - // If not applied to configurable - && !in_array(Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE, $attribute->getApplyTo()) - // If not used in configurable - && !in_array($attribute->getId(), - $this->_getProduct()->getTypeInstance(true)->getUsedProductAttributeIds($this->_getProduct())) - ) + && $attribute->getApplyTo() + // If not applied to configurable + && !in_array(Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE, $attribute->getApplyTo()) + // If not used in configurable + && !in_array($attribute->getId(), $usedAttributes)) // Or in additional - || in_array($attribute->getAttributeCode(), $attributesConfig['additional']) + || in_array($attributeCode, $attributesConfig['additional']) ) { $inputType = $attribute->getFrontend()->getInputType(); if (!in_array($inputType, $availableTypes)) { continue; } - $attributeCode = $attribute->getAttributeCode(); $attribute->setAttributeCode('simple_product_' . $attributeCode); $element = $fieldset->addField( 'simple_product_' . $attributeCode, - $inputType, - [ + $inputType, + [ 'label' => $attribute->getFrontend()->getLabel(), 'name' => $attributeCode, 'required' => $attribute->getIsRequired(), - ] + ] )->setEntityAttribute($attribute); if (in_array($attributeCode, $attributesConfig['autogenerate'])) { $element->setDisabled('true'); $element->setValue($this->_getProduct()->getData($attributeCode)); $element->setAfterElementHtml( - ' ' - . '' + ' ' + . '' ); } @@ -108,7 +111,6 @@ protected function _prepareForm() } /* Configurable attributes */ - $usedAttributes = $this->_getProduct()->getTypeInstance(true)->getUsedProductAttributes($this->_getProduct()); foreach ($usedAttributes as $attribute) { $attributeCode = $attribute->getAttributeCode(); $fieldset->addField( 'simple_product_' . $attributeCode, 'select', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php index e3a80b54985..da4fe60ce1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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..3f46f70ab52 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +30,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings extends Mage_ { /** * Prepare block children and data - * */ protected function _prepareLayout() { @@ -82,14 +82,17 @@ protected function _prepareForm() $fieldset->addField('req_text', 'note', [ 'text' => '
    • ' - . $this->__('Only attributes with scope "Global", input type "Dropdown" and Use To Create Configurable Product "Yes" are available.') - . '
' + . $this->__('Only attributes with scope "Global", input type "Dropdown" and Use To Create Configurable Product "Yes" are available.') + . '' ]); $hasAttributes = false; + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + foreach ($attributes as $attribute) { - if ($product->getTypeInstance(true)->canUseAttribute($attribute, $product)) { + if ($productType->canUseAttribute($attribute, $product)) { $hasAttributes = true; $fieldset->addField('attribute_'.$attribute->getAttributeId(), 'checkbox', [ 'label' => $attribute->getFrontend()->getLabel(), @@ -103,9 +106,9 @@ protected function _prepareForm() if ($hasAttributes) { $fieldset->addField('attributes', 'hidden', [ - 'name' => 'attribute_validate', - 'value' => '', - 'class' => 'validate-super-product-attributes' + 'name' => 'attribute_validate', + 'value' => '', + 'class' => 'validate-super-product-attributes' ]); $fieldset->addField('continue_button', 'note', [ 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..8d04b572260 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php index 697d673d1b4..9ed824fa8de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php index 1840f68e45a..927998de432 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +30,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Upsell extends Mage_Adminhtml_Block_Widget_Grid { - /** * Set grid params * @@ -86,7 +86,7 @@ protected function _addColumnFilterToCollection($column) /** * Checks when this block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { 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..4e5598c3003 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,9 +30,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Websites extends Mage_Adminh { protected $_storeFromHtml; - /** - * Constructor - */ public function __construct() { parent::__construct(); @@ -92,7 +90,7 @@ public function hasWebsite($websiteId) /** * Check websites block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { 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..cbe557466cc 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php index 83ae19eb533..28141b15670 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php index 875eb064d39..3b540e647d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..2bb1384991d 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php index 1c304dc0273..7691381aaa4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Apply.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php index 646d364e964..742aa7090af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @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/Boolean.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php index c4c28b384e6..8fb24b7039f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Config.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php index 732dca670b0..79894977b33 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php index b0cb0f93fbd..c062a6ed3c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -148,7 +149,7 @@ public function getAttributeFieldName($attribute) * Check readonly attribute * * @param Mage_Eav_Model_Entity_Attribute|string $attribute - * @return boolean + * @return bool */ public function getAttributeReadonly($attribute) { @@ -171,7 +172,7 @@ public function toHtml() /** * Default sore ID getter * - * @return integer + * @return int */ protected function _getDefaultStoreId() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php index bf646e3995c..ecd57c5cd4d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Image.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php index 2a009af145e..4850256d9c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php index 246d9892f72..248dd68e50a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php index bfbbba1193a..4a394f1ebcb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php index a49d19976b3..4e11c9021bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,13 +28,19 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Price extends Varien_Data_Form_Element_Text { - + /** + * @param array $attributes + */ public function __construct($attributes= []) { parent::__construct($attributes); $this->addClass('validate-zero-or-greater'); } + /** + * @return string + * @throws Mage_Core_Model_Store_Exception + */ public function getAfterElementHtml() { $html = parent::getAfterElementHtml(); @@ -61,6 +68,10 @@ public function getAfterElementHtml() return $html; } + /** + * @param $attribute + * @return string + */ protected function _getTaxObservingCode($attribute) { $spanId = "dynamic-tax-{$attribute->getAttributeCode()}"; @@ -68,6 +79,10 @@ protected function _getTaxObservingCode($attribute) return ""; } + /** + * @param null $index + * @return string|null + */ public function getEscapedValue($index=null) { $value = $this->getValue(); @@ -78,6 +93,5 @@ public function getEscapedValue($index=null) return number_format($value, 2, null, ''); } - } 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..c30d5074be1 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php index eb59fca0418..96cce9f8eee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,8 +24,8 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Catalog_Product_Price extends Mage_Catalog_Block_Product_Price { - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php index 09491e28550..98b0bacc059 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Widget/Chooser/Container.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php index b7207da7f81..272c830ffcd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php index d22515c61b4..bfab3042b72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search.php @@ -7,26 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog price rules * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Catalog_Search extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php index b09081eee1b..ab61fc9d791 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php index 986446dd20b..89a58283232 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php index 7f04fbbe101..2183202b7e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php index f9496171fb0..6720ad49ece 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php index 29a661a6508..6757b6c84b8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php index 735bdcaffc0..88484197189 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php index 52c8224ae23..5747d42a68b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php index 283bc0ff9f2..51a3f2c91b2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Formkey.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Adminhtml_Block_Checkout_Formkey extends Mage_Adminhtml_Block_Templat * Check form key validation on checkout. * If disabled, show notice. * - * @return boolean + * @return bool */ public function canShow() { diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php index 36241e8619a..7dec18c949c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index 6b741b9b884..bd3918e287e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php index feabde483d5..6bdccef4ce3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index 9d641e2cd1c..a58fc95e4be 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Block/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php index 2f9dadfe332..80e51f81adc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php index b4a52190070..74606dc12c3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,6 @@ */ class Mage_Adminhtml_Block_Cms_Page extends Mage_Adminhtml_Block_Widget_Grid_Container { - - /** - * Block constructor - */ public function __construct() { $this->_controller = 'cms_page'; @@ -56,5 +53,4 @@ protected function _isAllowedAction($action) { return Mage::getSingleton('admin/session')->isAllowed('cms/page/' . $action); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index e96dff5aaae..634a13f7f40 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php index 114836cb255..625bf9fd5d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php index 8b90298bba2..1d645abd2f4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Design.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php index ebaf0ec30d3..0672d7c1f85 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php index 359a429795b..952bf3e416d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Cms_Page_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php index 369e120db5d..6323f262900 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..b8bb9423bb1 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index 8a3985d4491..aff410086c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php index e5b9687297a..77d18036439 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php index f54e4608901..d3bf31f1b64 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php index 2d7c7862ceb..2c1efd008d4 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -123,8 +124,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/Files.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php index 85683763293..319c35a9d65 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php index d4236fff771..90fa79b3abb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +27,4 @@ */ class Mage_Adminhtml_Block_Cms_Wysiwyg_Images_Content_Newfolder extends Mage_Adminhtml_Block_Template { - } 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..4f09335c774 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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..b190e157dfc 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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.php b/app/code/core/Mage/Adminhtml/Block/Customer.php index a057ac795b2..06d1fed0270 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php index 46c11a813a0..3839dac3076 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php index 8122922741b..c001b9a1a17 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Renderer/Adminpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php index d071e161fef..48b7d7a3b1c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @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/Renderer/Attribute/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php index 07f0e7fcd18..ae655762d41 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Renderer/Newpass.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php index 2be3577302d..8d3d1926140 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php index ff417ab09be..7a4386f3f76 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 @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer address region field renderer * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Customer_Edit_Renderer_Region extends Mage_Adminhtml_Block_Abstract @@ -35,8 +38,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/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index cd0eba028e9..ef7495da913 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php index e2aea43ad95..261a33fb46d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php index e2ae065ac55..7c8c386e209 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,15 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_Cart extends Mage_Adminhtml_Block_Widget_Grid { + /** + * @var string + */ + protected $_parentTemplate; + + /** + * Mage_Adminhtml_Block_Customer_Edit_Tab_Cart constructor. + * @param array $attributes + */ public function __construct($attributes= []) { parent::__construct($attributes); @@ -58,8 +68,7 @@ protected function _prepareCollection() if ($quote) { $collection = $quote->getItemsCollection(false); - } - else { + } else { $collection = new Varien_Data_Collection(); } @@ -147,14 +156,21 @@ public function getCustomer() { return Mage::registry('current_customer'); } + /** + * @return string + */ public function getGridUrl() { - return $this->getUrl('*/*/cart', ['_current'=>true, 'website_id' => $this->getWebsiteId()]); + return $this->getUrl('*/*/cart', ['_current' => true, 'website_id' => $this->getWebsiteId()]); } + /** + * @return string + * @throws Exception + */ public function getGridParentHtml() { - $templateName = Mage::getDesign()->getTemplateFilename($this->_parentTemplate, ['_relative'=>true]); + $templateName = Mage::getDesign()->getTemplateFilename($this->_parentTemplate, ['_relative' => true]); return $this->fetchView($templateName); } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php index dd95c961843..b2913b06a90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php index 3a0a8e88360..ef6549edf91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter extends Mage_Adminhtml_Block_Widget_Form { - public function __construct() { parent::__construct(); @@ -96,5 +96,4 @@ protected function _prepareLayout() ); return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php index aa6d73ef562..58aac119de6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php index 86c4ddd50e1..8d0fcd2998e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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() @@ -43,6 +43,9 @@ public function __construct() parent::__construct(); } + /** + * @return array + */ protected function _getOptions() { $result = []; @@ -53,13 +56,15 @@ protected function _getOptions() return $result; } + /** + * @return array|null + */ public function getCondition() { - if(is_null($this->getValue())) { + if (is_null($this->getValue())) { return null; } return ['eq'=>$this->getValue()]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php index 4371777b10a..edcee8c14f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php index 75d84ab8857..673b3b10b40 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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() @@ -49,11 +49,6 @@ public function render(Varien_Object $row) public static function getStatus($status) { - if(isset(self::$_statuses[$status])) { - return self::$_statuses[$status]; - } - - return Mage::helper('customer')->__('Unknown'); + return self::$_statuses[$status] ?? Mage::helper('customer')->__('Unknown'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php index f420f810bee..e496b410aa9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php index 345fea56537..804e1ab06ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php index a9ef0c8b68c..7f312811136 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +30,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..b38bde22f23 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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 f437467838e..4d3eccfd6d9 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,15 +26,18 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Block_Customer_Edit_Tab_View - extends Mage_Adminhtml_Block_Template - implements Mage_Adminhtml_Block_Widget_Tab_Interface +class Mage_Adminhtml_Block_Customer_Edit_Tab_View extends Mage_Adminhtml_Block_Template implements Mage_Adminhtml_Block_Widget_Tab_Interface { - + /** + * @var Mage_Customer_Model_Customer + */ protected $_customer; protected $_customerLog; + /** + * @return Mage_Customer_Model_Customer + */ public function getCustomer() { if (!$this->_customer) { @@ -42,6 +46,9 @@ public function getCustomer() return $this->_customer; } + /** + * @return string|void + */ public function getGroupName() { if ($groupId = $this->getCustomer()->getGroupId()) { @@ -77,9 +84,12 @@ public function getCreateDate() : null; } + /** + * @return string|null + */ public function getStoreCreateDate() { - if ( ! $this->getCustomer()->getCreatedAt()) { + if (! $this->getCustomer()->getCreatedAt()) { return null; } $date = Mage::app()->getLocale()->storeDate( @@ -108,6 +118,9 @@ public function getLastLoginDate() : Mage::helper('customer')->__('Never'); } + /** + * @return string + */ public function getStoreLastLoginDate() { if ($date = $this->getCustomerLog()->getLoginAtTimestamp()) { @@ -127,6 +140,9 @@ public function getStoreLastLoginDateTimezone() ->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE); } + /** + * @return string + */ public function getCurrentStatus() { $log = $this->getCustomerLog(); @@ -138,6 +154,9 @@ public function getCurrentStatus() return Mage::helper('customer')->__('Online'); } + /** + * @return string + */ public function getIsConfirmedStatus() { $this->getCustomer(); @@ -160,38 +179,55 @@ public function getStoreId() return $this->getCustomer()->getStoreId(); } + /** + * @return string + */ public function getBillingAddressHtml() { $html = ''; if ($address = $this->getCustomer()->getPrimaryBillingAddress()) { $html = $address->format('html'); - } - else { + } else { $html = Mage::helper('customer')->__('The customer does not have default billing address.'); } return $html; } + /** + * @return string + */ public function getAccordionHtml() { return $this->getChildHtml('accordion'); } + /** + * @return string + */ public function getSalesHtml() { return $this->getChildHtml('sales'); } + /** + * @return string + */ public function getTabLabel() { return Mage::helper('customer')->__('Customer View'); } + /** + * @return string + */ public function getTabTitle() { return Mage::helper('customer')->__('Customer View'); } + /** + * @return bool + */ public function canShowTab() { if (Mage::registry('current_customer')->getId()) { @@ -200,6 +236,9 @@ public function canShowTab() return false; } + /** + * @return bool + */ public function isHidden() { if (Mage::registry('current_customer')->getId()) { @@ -209,9 +248,9 @@ public function isHidden() } /** - * @deprecated * Return instance of core helper * + * @deprecated * @return Mage_Core_Helper_Data */ protected function _getCoreHelper() diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php index abc2deda17e..e8c67f2ec77 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php index 1e7f8c95438..fdec31fa4ce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php index 16ff126eea7..15b89eabbf4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,13 +63,7 @@ protected function _getProductHelper($product) // Check whether we have helper for our product $productType = $product->getTypeId(); - if (isset($productHelpers[$productType])) { - $helperName = $productHelpers[$productType]; - } else if (isset($productHelpers['default'])) { - $helperName = $productHelpers['default']; - } else { - $helperName = 'catalog/product_configuration'; - } + $helperName = $productHelpers[$productType] ?? $productHelpers['default'] ?? 'catalog/product_configuration'; $helper = Mage::helper($helperName); if (!($helper instanceof Mage_Catalog_Helper_Product_Configuration_Interface)) { diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php index 8f428de1d54..ad730750d69 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php index f885c641ec7..a1834c80493 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Sales extends Mage_Adminhtml_Block_Template { - /** * Sales entity collection * @@ -94,7 +94,7 @@ public function _beforeToHtml() public function getWebsiteCount($websiteId) { - return isset($this->_websiteCounts[$websiteId]) ? $this->_websiteCounts[$websiteId] : 0; + return $this->_websiteCounts[$websiteId] ?? 0; } public function getRows() @@ -129,5 +129,4 @@ public function formatCurrency($price, $websiteId = null) { return Mage::app()->getWebsite($websiteId)->getBaseCurrency()->format($price); } - } 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..63e8b212637 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,6 @@ */ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Wishlist extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Initial settings - */ public function __construct() { parent::__construct(); @@ -91,7 +89,6 @@ protected function _prepareColumns() 'header' => Mage::helper('customer')->__('Date Added'), 'index' => 'added_at', 'type' => 'date', - 'width' => '140px', ]); $this->addColumn('days', [ 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..6a44f232d79 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -192,7 +193,6 @@ public function getGridUrl() */ protected function _addColumnFilterToCollection($column) { - /** @var Mage_Wishlist_Model_Resource_Item_Collection $collection */ $collection = $this->getCollection(); $value = $column->getFilter()->getValue(); if ($collection && $value) { diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php index 818e32e18c2..f86701cc0bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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..564e97f9065 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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/Form/Element/Boolean.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php index 13b5fd38ad9..36ca0c3e9e4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php index a821978c599..1b9f29a2e2a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -171,7 +172,7 @@ protected function _getPreviewUrl() * * @param string $element * @param array $attributes - * @param boolean $closed + * @param bool $closed * @return string */ protected function _drawElementHtml($element, array $attributes, $closed = true) @@ -187,8 +188,8 @@ protected function _drawElementHtml($element, array $attributes, $closed = true) /** * Return escaped value * - * @param int $index - * @return string + * @param string|null $index + * @return false|string */ public function getEscapedValue($index = null) { diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php index 50ec6de44fb..3b6de921a8c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,7 +80,7 @@ protected function _getPreviewHtml() /** * Return Image URL - * @return string + * @return string|false */ protected function _getPreviewUrl() { diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php index 885633c3d42..7ec059c3015 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php index d3f2362e353..0945af5b270 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php index aebb9802f38..b96ab7aebc6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php index 004cbd872b2..fe701dc0085 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php index c211da00efe..506829616a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php index 831008b5387..b43d3d0d42f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php index 2e6f9c0b500..56ad738ad2e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Online.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php index 028a95fe442..0b4ea30eabf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Customer_Online extends Mage_Adminhtml_Block_Template { - public function __construct() { parent::__construct(); @@ -50,5 +49,4 @@ public function getFilterFormHtml() { return $this->getChild('filterForm')->toHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php index 400c7bdbfc0..9a89d8420fb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index 1d8f247ac6c..702639bc3f0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,7 +112,6 @@ protected function _prepareColumns() $this->addColumn('session_start_time', [ 'header' => Mage::helper('customer')->__('Session Start Time'), 'align' => 'left', - 'width' => '200px', 'type' => 'datetime', 'default' => Mage::helper('customer')->__('n/a'), 'index' =>'first_visit_at' @@ -120,7 +120,6 @@ protected function _prepareColumns() $this->addColumn('last_activity', [ 'header' => Mage::helper('customer')->__('Last Activity'), 'align' => 'left', - 'width' => '200px', 'type' => 'datetime', 'default' => Mage::helper('customer')->__('n/a'), 'index' => 'last_visit_at' diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php index 9f02db9d9c6..343fdc7e7c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,7 +28,6 @@ class Mage_Adminhtml_Block_Customer_Online_Grid_Renderer_Ip extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - public function render(Varien_Object $row) { /** @@ -37,5 +36,4 @@ public function render(Varien_Object $row) */ return @inet_ntop($row->getData($this->getColumn()->getIndex())); } - } 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..ca437eeee18 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..7e26c56f449 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..72b81766426 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7bc568a91d8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c710f73b165 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php index d5f64543044..6538fc0b5a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Bar.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php index 04026f42881..fc1cc82ce90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,6 +31,11 @@ class Mage_Adminhtml_Block_Dashboard_Bar extends Mage_Adminhtml_Block_Dashboard_ protected $_totals = []; protected $_currentCurrencyCode = null; + /** + * @var Mage_Directory_Model_Currency + */ + protected $_currency; + protected function _construct() { parent::_construct(); @@ -43,14 +49,6 @@ protected function getTotals() public function addTotal($label, $value, $isQuantity=false) { - /*if (!$isQuantity) { - $value = $this->format($value); - $decimals = substr($value, -2); - $value = substr($value, 0, -2); - } else { - $value = ($value != '')?$value:0; - $decimals = ''; - }*/ if (!$isQuantity) { $value = $this->format($value); } @@ -98,7 +96,7 @@ public function getCurrency() } else if ($this->getRequest()->getParam('website')){ $this->_currentCurrencyCode = Mage::app()->getWebsite($this->getRequest()->getParam('website'))->getBaseCurrency(); } else if ($this->getRequest()->getParam('group')){ - $this->_currentCurrencyCode = Mage::app()->getGroup($this->getRequest()->getParam('group'))->getWebsite()->getBaseCurrency(); + $this->_currentCurrencyCode = Mage::app()->getGroup($this->getRequest()->getParam('group'))->getWebsite()->getBaseCurrency(); } else { $this->_currentCurrencyCode = Mage::app()->getStore()->getBaseCurrency(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php index 9ae19869a08..bdea2a6dfef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index bd8b2021681..b58dd96dc0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -104,6 +105,9 @@ class Mage_Adminhtml_Block_Dashboard_Graph extends Mage_Adminhtml_Block_Dashboar */ protected $_htmlId = ''; + protected $_max; + protected $_min; + /** * Initialize object */ @@ -368,14 +372,14 @@ public function getChartUrl($directUrl = true) $valueBuffer[] = $indexid . ":|" . $tmpstring; if (count($this->_axisLabels[$idx]) > 1) { - $deltaX = 100/(count($this->_axisLabels[$idx])-1); + $deltaX = 100 / (count($this->_axisLabels[$idx]) - 1); } else { $deltaX = 100; } } else if ($idx === 'y') { $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels); - if (count($yLabels)-1) { - $deltaY = 100/(count($yLabels)-1); + if (count($yLabels) - 1) { + $deltaY = 100 / (count($yLabels) - 1); } else { $deltaY = 100; } @@ -473,7 +477,7 @@ protected function _getPow($number) { $pow = 0; while ($number >= 10) { - $number = $number/10; + $number = $number / 10; $pow++; } return $pow; diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php index 8ece2f14920..dcccd164ff1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Grids.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php index 847cd6521b6..19928ae331c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php index 89b57ef2fc7..f120e9bc585 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Sales.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php index 2056b471663..373c01bb2cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Sales extends Mage_Adminhtml_Block_Dashboard_Bar { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php index 2e52c7fa44f..758369fa063 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Searches_Last extends Mage_Adminhtml_Block_Dashboard_Grid { protected $_collection; diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php index 4ef2d7d18ad..51a8c97cc3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Dashboard_Searches_Renderer_Searchquery extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract 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..f1b5a205134 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php index 50f0ee2ef7d..349c4527ec1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Customers/Most.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php index 64b8fb1be89..77bdcaf1705 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Tab_Customers_Most extends Mage_Adminhtml_Block_Dashboard_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php index 5f8cb1d944e..4c7f20e94a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Tab_Customers_Newest extends Mage_Adminhtml_Block_Dashboard_Grid { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php index cf085e9e429..fcc7f2020d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,12 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Tab_Orders extends Mage_Adminhtml_Block_Dashboard_Graph { - /** - * Initialize object - */ public function __construct() { $this->setHtmlId('orders'); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php index e1272e3a6d0..90a660e4d46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Dashboard_Tab_Products_Ordered extends Mage_Adminhtml_Block_Dashboard_Grid { - public function __construct() { parent::__construct(); 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..31ba735a634 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,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..cbc8d52701e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Denied.php b/app/code/core/Mage/Adminhtml/Block/Denied.php index 44454a428a4..f395fbcb714 100644 --- a/app/code/core/Mage/Adminhtml/Block/Denied.php +++ b/app/code/core/Mage/Adminhtml/Block/Denied.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Date.php b/app/code/core/Mage/Adminhtml/Block/Html/Date.php index 1420735c95b..ed399a0b23e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Adminhtml HTML select element block * * @category Mage - * @package Mage_Core + * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Block_Html_Date extends Mage_Core_Block_Html_Date diff --git a/app/code/core/Mage/Adminhtml/Block/Html/Select.php b/app/code/core/Mage/Adminhtml/Block/Html/Select.php index 9fce64b072d..35daa46d735 100644 --- a/app/code/core/Mage/Adminhtml/Block/Html/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Html/Select.php @@ -7,27 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml HTML select element block * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Html_Select extends Mage_Core_Block_Html_Select { - /** * @return string */ @@ -35,5 +35,4 @@ protected function _getUrlModelClass() { return 'adminhtml/url'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php index d33f30a03ae..b04c721f4f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..e48adc7439d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Uploader.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Messages.php b/app/code/core/Mage/Adminhtml/Block/Messages.php index 98252713f1d..4891e719687 100644 --- a/app/code/core/Mage/Adminhtml/Block/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Messages.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Messages extends Mage_Core_Block_Messages { - /** * @return string */ @@ -35,5 +35,4 @@ protected function _getUrlModelClass() { return 'adminhtml/url'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php index 2c400637387..049fcea881a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Newsletter_Problem extends Mage_Adminhtml_Block_Template { - public function __construct() { parent::__construct(); @@ -80,5 +80,4 @@ public function getShowButtons() { return Mage::getResourceSingleton('newsletter/problem_collection')->getSize() > 0; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php index 36acde9abcf..723f9b6955a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php index a73866a63b5..612115f191a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php index 5318c150478..98e2b9944ec 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php index 0cc9d12ff65..a81a2691554 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,5 +37,4 @@ protected function _beforeToHtml() $this->setChild('grid', $this->getLayout()->createBlock('adminhtml/newsletter_queue_grid', 'newsletter.queue.grid')); return parent::_beforeToHtml(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php index ee185dce373..b85f93363ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +30,6 @@ class Mage_Adminhtml_Block_Newsletter_Queue_Edit extends Mage_Adminhtml_Block_Te { /** * Check for template Id in request - * */ protected function _construct() { @@ -50,6 +50,9 @@ public function getQueue() return Mage::registry('current_queue'); } + /** + * @inheritDoc + */ protected function _beforeToHtml() { $this->setTemplate('newsletter/queue/edit.phtml'); @@ -61,6 +64,10 @@ protected function _beforeToHtml() { return parent::_beforeToHtml(); } + /** + * @return string + * @throws Exception + */ public function getSaveUrl() { if ($this->getTemplateId()) { @@ -71,6 +78,9 @@ public function getSaveUrl() return $this->getUrl('*/*/save', $params); } + /** + * @inheritDoc + */ protected function _prepareLayout() { // Load Wysiwyg on demand and Prepare layout @@ -191,7 +201,7 @@ public function getResumeButtonHtml() /** * Getter for availability preview mode * - * @return boolean + * @return bool */ public function getIsPreview() { @@ -204,7 +214,7 @@ public function getIsPreview() /** * Getter for single store mode check * - * @return boolean + * @return bool */ protected function isSingleStoreMode() { @@ -214,7 +224,7 @@ protected function isSingleStoreMode() /** * Getter for id of current store (the only one in single-store mode and current in multi-stores mode) * - * @return boolean + * @return int */ protected function getStoreId() { @@ -224,7 +234,7 @@ protected function getStoreId() /** * Getter for check is this newsletter the plain text. * - * @return boolean + * @return bool */ public function getIsTextType() { @@ -234,7 +244,7 @@ public function getIsTextType() /** * Getter for availability resume action * - * @return boolean + * @return bool */ public function getCanResume() { @@ -244,10 +254,10 @@ public function getCanResume() /** * Getter for header text * - * @return boolean + * @return string */ public function getHeaderText() { - return ( $this->getIsPreview() ? Mage::helper('newsletter')->__('View Newsletter') : Mage::helper('newsletter')->__('Edit Newsletter')); + return ($this->getIsPreview() ? Mage::helper('newsletter')->__('View Newsletter') : Mage::helper('newsletter')->__('Edit Newsletter')); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php index a2b8c2b01bc..b5b66450d4d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php index bc09f4692d7..8605d8420a6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php index 92984b21418..6aab268fc43 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,20 +28,24 @@ */ class Mage_Adminhtml_Block_Newsletter_Queue_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action { + /** + * @param Mage_Newsletter_Model_Queue $row + * @return string + */ public function render(Varien_Object $row) { $actions = []; - if($row->getQueueStatus()==Mage_Newsletter_Model_Queue::STATUS_NEVER) { - if(!$row->getQueueStartAt() && $row->getSubscribersTotal()) { + if ($row->getQueueStatus() == Mage_Newsletter_Model_Queue::STATUS_NEVER) { + if (!$row->getQueueStartAt() && $row->getSubscribersTotal()) { $actions[] = [ - 'url' => $this->getUrl('*/*/start', ['id'=>$row->getId()]), + 'url' => $this->getUrl('*/*/start', ['id'=>$row->getId()]), 'caption' => Mage::helper('newsletter')->__('Start') ]; } - } else if ($row->getQueueStatus()==Mage_Newsletter_Model_Queue::STATUS_SENDING) { + } elseif ($row->getQueueStatus() == Mage_Newsletter_Model_Queue::STATUS_SENDING) { $actions[] = [ - 'url' => $this->getUrl('*/*/pause', ['id'=>$row->getId()]), + 'url' => $this->getUrl('*/*/pause', ['id'=>$row->getId()]), 'caption' => Mage::helper('newsletter')->__('Pause') ]; @@ -49,14 +54,11 @@ public function render(Varien_Object $row) 'confirm' => Mage::helper('newsletter')->__('Do you really want to cancel the queue?'), 'caption' => Mage::helper('newsletter')->__('Cancel') ]; - - } else if ($row->getQueueStatus()==Mage_Newsletter_Model_Queue::STATUS_PAUSE) { - + } elseif ($row->getQueueStatus() == Mage_Newsletter_Model_Queue::STATUS_PAUSE) { $actions[] = [ - 'url' => $this->getUrl('*/*/resume', ['id'=>$row->getId()]), + 'url' => $this->getUrl('*/*/resume', ['id'=>$row->getId()]), 'caption' => Mage::helper('newsletter')->__('Resume') ]; - } $actions[] = [ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php index 491545b77ad..7d994cb6b00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Newsletter_Queue_Preview extends Mage_Adminhtml_Block_Widget { - protected function _toHtml() { /** @var Mage_Newsletter_Model_Template $template */ @@ -76,5 +76,4 @@ protected function _toHtml() return $templateProcessed; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php index 55d3af6b2dc..6202cc634da 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php index f61b909541b..12d86307440 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,21 +26,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.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php index 3051e3fc2b8..d9b182290e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php index 6de98cf5c5c..a7549ef8d79 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php index 25a38587a74..f834066da36 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,14 @@ */ class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { - + /** + * @var Mage_Core_Model_Resource_Website_Collection + */ protected $_websiteCollection = null; + /** + * @return array[] + */ protected function _getOptions() { $result = $this->getCollection()->toOptionArray(); @@ -37,9 +43,13 @@ protected function _getOptions() return $result; } + /** + * @return Mage_Core_Model_Resource_Website_Collection + * @throws Mage_Core_Exception + */ public function getCollection() { - if(is_null($this->_websiteCollection)) { + if (is_null($this->_websiteCollection)) { $this->_websiteCollection = Mage::getResourceModel('core/website_collection') ->load(); } @@ -49,11 +59,14 @@ public function getCollection() return $this->_websiteCollection; } + /** + * @return array|null + * @throws Mage_Core_Exception + */ public function getCondition() { - $id = $this->getValue(); - if(!$id) { + if (!$id) { return null; } @@ -61,5 +74,4 @@ public function getCondition() return ['in'=>$website->getStoresIds(true)]; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php index 461a405e451..bea3c73718c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php index da3ddb1d5b8..936f0195da4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Newsletter/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php index af9e989ff18..3562c5e994f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -216,7 +217,7 @@ public function getSaveAsButtonHtml() /** * Set edit flag for block * - * @param boolean $value + * @param bool $value * @return $this */ public function setEditMode($value = true) @@ -228,7 +229,7 @@ public function setEditMode($value = true) /** * Return edit flag for block * - * @return boolean + * @return bool */ public function getEditMode() { @@ -314,7 +315,7 @@ public function getDeleteUrl() /** * Retrieve Save As Flag * - * @return int + * @return string */ public function getSaveAsFlag() { @@ -324,7 +325,7 @@ public function getSaveAsFlag() /** * Getter for single store mode check * - * @return boolean + * @return bool */ protected function isSingleStoreMode() { @@ -334,7 +335,7 @@ protected function isSingleStoreMode() /** * Getter for id of current store (the only one in single-store mode and current in multi-stores mode) * - * @return boolean + * @return int */ protected function getStoreId() { diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php index 79825e38fa2..65131b3259f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php index 37fbe16b4c8..48466426305 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php index 5bac71e3cac..70b869e54f8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,12 +31,12 @@ class Mage_Adminhtml_Block_Newsletter_Template_Grid_Renderer_Action extends Mage /** * Renderer for "Action" column in Newsletter templates grid * - * @param Mage_Newsletter_Model_Template|Varien_Object $row + * @param Mage_Newsletter_Model_Template $row * @return string */ public function render(Varien_Object $row) { - if($row->isValidForSend()) { + if ($row->isValidForSend()) { $actions[] = [ 'url' => $this->getUrl('*/newsletter_queue/edit', ['template_id' => $row->getId()]), 'caption' => Mage::helper('newsletter')->__('Queue Newsletter...') diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php index dcb49c23508..655b771fb85 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Newsletter_Template_Grid_Renderer_Sender extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php index 0cf678fe379..05ca037fbd3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Newsletter_Template_Preview extends Mage_Adminhtml_Block_Widget { - protected function _toHtml() { /** @var Mage_Newsletter_Model_Template $template */ @@ -75,5 +75,4 @@ protected function _toHtml() return $templateProcessed; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php index bbb527cd361..e9d1fd38ebb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Baseurl.php b/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php index 58417bf0b41..3e6e167387d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Curl.php b/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php index 6d65905a79d..2bf15dda3e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Curl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php index 4692caa2a98..f1acf6b0f7c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,7 +67,6 @@ protected function _prepareColumns() $this->addColumn('date_added', [ 'header' => Mage::helper('adminnotification')->__('Date Added'), 'index' => 'date_added', - 'width' => '150px', 'type' => 'datetime' ]); @@ -110,7 +110,7 @@ protected function _prepareMassaction() } /** - * @param Varien_Object $row + * @param Mage_AdminNotification_Model_Inbox $row * @return string */ public function getRowClass(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php index 4ae38886693..44a9cf769f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Renderer/Notice.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php index c64615baef3..630570979fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Grid/Renderer/Severity.php b/app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php index 70146847722..816897fe609 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php index 3e90b751307..a74502070b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Security.php b/app/code/core/Mage/Adminhtml/Block/Notification/Security.php index dafe5321b8a..d3f224b409d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Security.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Security.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Security extends Mage_Adminhtml_Block_Template { // Cache kay for saving verification result diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php index d173bf742c0..7fe10040d36 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +33,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..82a8e11d8c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Page.php b/app/code/core/Mage/Adminhtml/Block/Page.php index 34755d610f8..45076fae6ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page.php +++ b/app/code/core/Mage/Adminhtml/Block/Page.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,11 +28,6 @@ */ class Mage_Adminhtml_Block_Page extends Mage_Adminhtml_Block_Template { - - /** - * Class constructor - * - */ public function __construct() { parent::__construct(); @@ -67,5 +63,4 @@ public function addBodyClass($className) $this->setBodyClass($this->getBodyClass() . ' ' . $className); return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php index 26a3b1c578e..dc99b7a0079 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Footer.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Footer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Head.php b/app/code/core/Mage/Adminhtml/Block/Page/Head.php index ad06fbb5f40..7afe1ab37f9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Head.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Head.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +49,8 @@ public function getFormKey() /** * Retrieve Timeout Delay from Config * - * @return string + * @return int + * @since 19.4.18 / 20.0.16 */ public function getLoadingTimeout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Header.php b/app/code/core/Mage/Adminhtml/Block/Page/Header.php index f5a387f3cd8..57a7779bff2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Header.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +52,7 @@ public function getLogoutLink() /** * Check if noscript notice should be displayed * - * @return boolean + * @return bool */ public function displayNoscriptNotice() { diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php index c6201940b35..37ad498b04d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php @@ -7,26 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml menu block * - * @method Mage_Adminhtml_Block_Page_Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo) - * @method array getAdditionalCacheKeyInfo() - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method Mage_Adminhtml_Block_Page_Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo) + * @method array getAdditionalCacheKeyInfo() */ class Mage_Adminhtml_Block_Page_Menu extends Mage_Adminhtml_Block_Template { @@ -183,8 +184,8 @@ protected function _buildMenuArray(Varien_Simplexml_Element $parent, $path='', $ /** * Sort menu comparison function * - * @param int $a - * @param int $b + * @param array $a + * @param array $b * @return int */ protected function _sortMenu($a, $b) @@ -220,14 +221,6 @@ protected function _checkDepends(Varien_Simplexml_Element $depends) return true; } - /*protected function _checkAcl(Varien_Simplexml_Element $acl) - { - return true; - $resource = (string)$acl->resource; - $privilege = (string)$acl->privilege; - return Mage::getSingleton('admin/session')->isAllowed($resource, $privilege); - }*/ - /** * Check is Allow menu item for admin user * diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Notices.php b/app/code/core/Mage/Adminhtml/Block/Page/Notices.php index 2ebb856d2ba..13799becb2b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Page/Notices.php +++ b/app/code/core/Mage/Adminhtml/Block/Page/Notices.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,11 +28,10 @@ */ class Mage_Adminhtml_Block_Page_Notices extends Mage_Adminhtml_Block_Template { - /** * Check if noscript notice should be displayed * - * @return boolean + * @return bool */ public function displayNoscriptNotice() { @@ -41,11 +41,10 @@ public function displayNoscriptNotice() /** * Check if demo store notice should be displayed * - * @return boolean + * @return bool */ public function displayDemoNotice() { return Mage::getStoreConfig('design/head/demonotice'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php index 403abe34bad..c3395c5144c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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..41c3d847fdb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -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/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php index 09f0e03d0ec..40592bf5ee2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php index 268f02522b6..26a06dbc328 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php index 6debc6fd162..804e52cad34 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php index a7faae9f543..07e7a8453ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php index 0f296be1ab2..294749569a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php index 9a5c524f262..e4ce93dee1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php index 5157f68c4a0..efd94ba5d58 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Permissions_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -80,6 +80,5 @@ public function getRowUrl($row) { return $this->getUrl('*/*/edituser', ['id' => $row->getUserId()]); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php index 35a99a5d011..150653fed03 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Role.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Permissions_Role extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'permissions_role'; @@ -36,5 +34,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('adminhtml')->__('Add New Role'); parent::__construct(); } - } 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..2820f6b8279 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Permissions_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -171,6 +171,5 @@ protected function _getUsers($json=false) } } } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php index dd607ed8d9e..a0fbc773e55 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php index a24d01416fe..6cda7b293e1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * implementing now - * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Permissions_Tab_Roleinfo extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php index 565637199bb..0c67d69f989 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -127,7 +128,7 @@ public function __construct() /** * Check if everything is allowed * - * @return boolean + * @return bool */ public function getEverythingAllowed() { @@ -146,7 +147,7 @@ public function getResTreeJson() $rootArray = $this->_getNodeJson($resources->admin, 1); - return Mage::helper('core')->jsonEncode(isset($rootArray['children']) ? $rootArray['children'] : []); + return Mage::helper('core')->jsonEncode($rootArray['children'] ?? []); } /** @@ -154,7 +155,7 @@ public function getResTreeJson() * * @param array $a * @param array $b - * @return boolean + * @return int */ protected function _sortTree($a, $b) { diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php index e9e92f8408a..71dab9de701 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs { public function __construct() @@ -47,5 +52,4 @@ protected function _getJsObjectName() { return $this->getChild('userGrid')->getJsObjectName(); } - } 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..afb677967c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +165,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..36d9410c85d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..282eb06e912 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Permissions_User extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'permissions_user'; @@ -37,8 +37,6 @@ public function __construct() } /** - * Prepare output HTML - * * @return string */ protected function _toHtml() diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php index 6af36b10722..24dc75f87c3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php index 6de39f67e05..a4095789006 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php index d09854a2cd2..63d6bdfdcb4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Permissions_User_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $model = Mage::registry('permissions_user'); diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php index 9e2d8c4f394..d020693a60c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -118,5 +123,4 @@ protected function _getSelectedRoles($json=false) return $uRoles; } } - } 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..6ad03dfea8c 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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/User/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php index 86e1df76ab2..f5dee2004f8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php index cc9089d3633..b4f3b52ca7d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php @@ -7,20 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..3ee7c80f7d5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Users.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..6dcbd7b85c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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..50007e4ef0a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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_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/Permissions/Variable/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php index 3e88055d5b2..02117197c50 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php index e179eb6073f..d9946eb0c57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php index a55295f6d48..b5bb8f99106 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php index 1d02bf32b1c..0d387f757b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php index 9ce540a7120..5800562a177 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php index 741c90dc7cc..1e3da49fd5b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php index e903251924e..7c7b59ff003 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php index 4df32b1e65c..dbc296327ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php index e52f9e19a04..f2d17ebebd2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php index ef101e135cc..910428b5288 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Poll_Edit_Tab_Answers_List extends Mage_Adminhtml_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php index 7e899bdf7a6..5f1e04f6872 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..98ceeb235df 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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/Poll/Grid.php b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php index 457aa6a5f68..9ee8c8c2ebc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +86,6 @@ protected function _prepareColumns() $this->addColumn('date_posted', [ 'header' => Mage::helper('poll')->__('Date Posted'), 'align' => 'left', - 'width' => '120px', 'type' => 'datetime', 'index' => 'date_posted', 'format' => Mage::app()->getLocale()->getDateFormat() @@ -94,7 +94,6 @@ protected function _prepareColumns() $this->addColumn('date_closed', [ 'header' => Mage::helper('poll')->__('Date Closed'), 'align' => 'left', - 'width' => '120px', 'type' => 'datetime', 'default' => '--', 'index' => 'date_closed', diff --git a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php index d5be40a1120..37c9e390f7c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +++ b/app/code/core/Mage/Adminhtml/Block/Poll/Poll.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Poll_Poll extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'poll'; @@ -35,5 +34,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('poll')->__('Add New Poll'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php index eca7f8755b8..5299b5b6f71 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Catalog/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php index e8a56966842..4a4abc86f96 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Catalog/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php index fbcb692bf5a..241af5887b8 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 @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php index 4c110722f7c..73cb2f21d56 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php @@ -7,20 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php index 1175464dcd7..135a5fbc837 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Catalog/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php index 4c958fbca39..e488504f6f0 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 @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php index 530f73f7686..0738b275368 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Catalog/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php index 46bef5f489c..028896e0de0 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 @@ -7,28 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Catalog/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php index 44c307287e1..cad68b41652 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +82,6 @@ protected function _prepareColumns() $this->addColumn('from_date', [ 'header' => Mage::helper('catalogrule')->__('Date Start'), 'align' => 'left', - 'width' => '120px', 'type' => 'date', 'index' => 'from_date', ]); @@ -89,7 +89,6 @@ protected function _prepareColumns() $this->addColumn('to_date', [ 'header' => Mage::helper('catalogrule')->__('Date Expire'), 'align' => 'left', - 'width' => '120px', 'type' => 'date', 'default' => '--', 'index' => 'to_date', @@ -126,7 +125,7 @@ protected function _prepareColumns() /** * Retrieve row click URL * - * @param Varien_Object $row + * @param Mage_CatalogRule_Model_Rule $row * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php index eea74770e7d..a12a14acaf4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote.php @@ -7,26 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog price rules * - * @category Mage * @category Mage * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Promo_Quote extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php index a5996fca248..53122e41507 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php index 32b8905a22e..43740591b8a 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 @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php index dab086fdf45..eb25b7644d8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php index 6dd29ea1556..489b585dc2e 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 @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php index d8d2e4307ea..18b8cc10668 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php index 3bc24d08027..82aa9e78f0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php index 05c378c8a46..ccbb209502f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +73,6 @@ protected function _prepareColumns() 'index' => 'created_at', 'type' => 'datetime', 'align' => 'center', - 'width' => '160' ]); $this->addColumn('used', [ 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..b785d855757 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php index 1520e4e738e..2db7b511dab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Promo_Quote_Edit_Tab_Labels extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php index 34db2e613e7..aba5e114d31 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php index 9123c5d59f7..2d60d1bb9c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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..1fac733f6f6 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 @@ -7,28 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Quote/Grid.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php index 4798ec045ab..563eff4329c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -89,7 +90,6 @@ protected function _prepareColumns() $this->addColumn('from_date', [ 'header' => Mage::helper('salesrule')->__('Date Start'), 'align' => 'left', - 'width' => '120px', 'type' => 'date', 'index' => 'from_date', ]); @@ -97,7 +97,6 @@ protected function _prepareColumns() $this->addColumn('to_date', [ 'header' => Mage::helper('salesrule')->__('Date Expire'), 'align' => 'left', - 'width' => '120px', 'type' => 'date', 'default' => '--', 'index' => 'to_date', diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php index ebc5940cb4c..4ad4b67cc34 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -137,7 +138,6 @@ protected function _prepareColumns() $this->addColumn('from_date', [ 'header' => Mage::helper('salesrule')->__('Date Start'), 'align' => 'left', - 'width' => '120px', 'type' => 'date', 'index' => 'from_date', ]); @@ -145,7 +145,6 @@ protected function _prepareColumns() $this->addColumn('to_date', [ 'header' => Mage::helper('salesrule')->__('Date Expire'), 'align' => 'left', - 'width' => '120px', 'type' => 'date', 'default' => '--', 'index' => 'to_date', diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php index b9c12220edf..78f75e9dae7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -119,10 +120,8 @@ public function setRangeValues($from, $to) public function setRangeValue($delimitedString) { $split = explode($this->_rangeDelimiter, $delimitedString, 2); - $from = $split[0]; $to = ''; - if (isset($split[1])) { - $to = $split[1]; - } + $from = $split[0]; + $to = $split[1] ?? ''; return $this->setRangeValues($from, $to); } 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..7e7ea6a568a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php index 723ce425ea5..11419fc4e97 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php index bc69143628b..0792ceca111 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php index 096d1a72579..b28a98d1cfa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Options.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php index 588e952de15..e613a185aee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ */ class Mage_Adminhtml_Block_Rating_Edit_Tab_Options extends Mage_Adminhtml_Block_Widget_Form { - protected function _prepareForm() { $form = new Varien_Data_Form(); @@ -64,5 +64,4 @@ protected function _prepareForm() $this->setForm($form); return parent::_prepareForm(); } - } 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..a5eecf0c276 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Rating_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs { - public function __construct() { parent::__construct(); @@ -44,14 +44,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..bdcd57b68ad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Grid.php @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * description - * * @category Mage * @package Mage_Adminhtml * @author Magento Core Team diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php index b3791b1f8a7..173752c528a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Rating.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Rating_Rating extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php index 9ff3cc914ce..c49d21a5deb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Report_Config_Form_Field_MtdStart extends Mage_Adminhtml_Block_System_Config_Form_Field { - protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) { $_days = []; 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..1f517a91cb2 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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 = []; @@ -52,12 +52,12 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) $_monthsHtml = $element->setStyle('width:100px;') ->setValues($_months) - ->setValue(isset($values[0]) ? $values[0] : null) + ->setValue($values[0] ?? null) ->getElementHtml(); $_daysHtml = $element->setStyle('width:50px;') ->setValues($_days) - ->setValue(isset($values[1]) ? $values[1] : null) + ->setValue($values[1] ?? null) ->getElementHtml(); return sprintf('%s %s', $_monthsHtml, $_daysHtml); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php index 935ccde48a5..55faf346618 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Customer/Accounts/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php index 39bc7e3e224..4ce25269caf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Customer/Orders.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php index 589359be2ed..696c855e49d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Customer_Orders extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php index 93731d62d51..9ca1fbe25e9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Customer/Totals.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php index f5a04d0c030..b2c35fb48d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Customer/Totals/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php index 1582afa569e..3866e364302 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Filter/Form.php b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php index d8eaff58ca5..eb61fd52cea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index 42e29250040..139c76c2913 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,6 +57,17 @@ class Mage_Adminhtml_Block_Report_Grid extends Mage_Adminhtml_Block_Widget_Grid */ protected $_currentCurrencyCode = null; + /** + * @var Mage_Core_Model_Locale + */ + protected $_locale; + + /** @todo OM: check */ + protected $_filterValues; + + /** + * Mage_Adminhtml_Block_Report_Grid constructor. + */ public function __construct() { parent::__construct(); @@ -185,16 +197,18 @@ protected function _prepareCollection() $this->setCollection($collection); Mage::dispatchEvent('adminhtml_widget_grid_filter_collection', - ['collection' => $this->getCollection(), 'filter_values' => $this->_filterValues] + ['collection' => $this->getCollection(), 'filter_values' => $this->_filterValues] ); } + /** + * @param array $data + * @return $this + */ protected function _setFilterValues($data) { foreach ($data as $name => $value) { - //if (isset($data[$name])) { - $this->setFilter($name, $data[$name]); - //} + $this->setFilter($name, $data[$name]); } return $this; } @@ -521,7 +535,7 @@ public function getExcel($filename = '') foreach ($this->_columns as $column) { $j++; if (!$column->getIsSystem()) { - $row[] = ($j==1)?$this->__('Subtotal'):$column->getRowField($this->getTotals()); + $row[] = ($j == 1)?$this->__('Subtotal'):$column->getRowField($this->getTotals()); } } $data[] = $row; diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php index e07826f5f13..974ee3f54c3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,6 +31,13 @@ class Mage_Adminhtml_Block_Report_Grid_Abstract extends Mage_Adminhtml_Block_Wid protected $_storeIds = []; protected $_aggregatedColumns = null; + /** + * Column for grid to be grouped by + * + * @var string + */ + protected $_columnGroupBy; + /** * Mage_Adminhtml_Block_Report_Grid_Abstract constructor. */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php index 0cbf07ebf13..3e18375475b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php index a00d967af19..bb907e43407 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php index f4330e3e234..b8c59a58a47 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php index 7b90004fdde..7aa4c28d6a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php index 4a3704d6d02..f024d2f9ea4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,7 +42,7 @@ class Mage_Adminhtml_Block_Report_Grid_Shopcart extends Mage_Adminhtml_Block_Wid * storeIds setter * * @param array $storeIds - * @return Mage_Adminhtml_Block_Report_Grid_Shopcart_Abstract + * @return $this */ public function setStoreIds($storeIds) { diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Product.php index 542cc271a37..d2a6b35f8f8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Product extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php index de5a6b8f48d..3fe025abb70 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php index effc610bf83..3e31c2f88e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php index 76909f5a2f0..02cce9614e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php index 2e2f4a3e065..27b450f604d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Lowstock.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php index 4bbfe743149..582f08ed032 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Product_Lowstock extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php index 2372a5a78a7..bc96a15bd8a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php index e06e3885d5c..ca73ad70295 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php @@ -7,23 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml bestsellers products report content block * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team * @deprecated after 1.4.0.1 */ - class Mage_Adminhtml_Block_Report_Product_Ordered extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php index 6384be0625e..1a16bd9f9fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..e5b87273eea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Sold/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php index 631ed5bf407..e0392c60605 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php index bea7e0b0249..8c2fbd9036f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Product/Viewed/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php index c5744f0179c..1b283c7ef83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php index ab1f7c28d94..197386e0f00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Refresh/Statistics/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php index 63b6e0699cd..798f0103ece 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -132,7 +133,6 @@ protected function _prepareColumns() 'header' => Mage::helper('reports')->__('Updated At'), 'index' => 'updated_at', 'type' => 'datetime', - 'width' => 200, 'default' => Mage::helper('reports')->__('undefined'), 'sortable' => false ]); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php index 4401251155b..4e69e104fe1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php index b01bc934e03..b8be986d0ef 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php index a5de45c03b6..76b4ee40a25 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php index 792fbcfc936..bf6bbea964a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php index ac084e55ab0..25740333b7d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Review_Product extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php index b91c9ac46d4..2529e3ef58c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php index 464c2f4d033..96f494f8c43 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php index 9dbb8e00fe1..54724f5e212 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php index 679d957ab96..2c9695f725f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php index 6d4b1712da4..b882923e786 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php index a0875db6e42..6a2222eff86 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php index 29116e6ba3b..b7de9ceac15 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Sales_Invoiced extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php index 78c1866eac9..6e75b2add60 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php index 7a949d66a8f..e6c8b3d20e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Sales_Refunded extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php index acf84a4e208..e75b6795789 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php index 9926a7501a6..5424842ac2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Sales_Sales extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php index 390dc210af2..7e9a25762cb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php index 4709018b5a1..0659c50888d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Shipping/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php index e0b3e6f9d11..5c6eaf8fcff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php index 9867370b207..9256af530b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Sales/Tax/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php index e2b2cfcc4c1..a0eaac303fa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search.php b/app/code/core/Mage/Adminhtml/Block/Report/Search.php index 4c6432cc871..60592178a1f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Search extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php index 159cac2d539..367af4c4a12 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php index 631ec522713..63f534833ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php index ff98cbb5be5..a10aba57b8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php index 557133da764..388b47aad26 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php index 17ae1026e53..88b740f31e2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php index f0254153fa8..f4212b952ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Shopcart_Product extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php index 64dcb99a3ea..2957750a767 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php index 0644d9a2112..3b9b2c435a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Customer/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php index 49dd5085260..0c1486a12b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Customer/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php index a31192dda93..111c96f76e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +82,6 @@ protected function _prepareColumns() $this->addColumn('created_at', [ 'header' =>Mage::helper('reports')->__('Submitted On'), - 'width' => '140px', 'type' => 'datetime', 'index' => 'created_at' ]); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php index 96f8a13fc98..e7180d10dbe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Popular.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php index 5250fa6780e..2048ef1e81f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Tag_Popular extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php index 6319ec4ea5b..8807e353415 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Popular/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php index 9de3049d6ab..f579be6dcb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Popular/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php index 7c558b593fe..b33b94828d9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php index 42f019ed1db..39d3f1f32e8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Report_Tag_Product extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php index f401a9e4c96..ba89e17c6c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Product/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php index 65f3f910b15..e25c668c874 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php index add3692e87c..1fbfd0302a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php index d380fe23330..2b267cae10a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Report/Wishlist/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php index 6a99c2ce6eb..b49fa877e7e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add.php b/app/code/core/Mage/Adminhtml/Block/Review/Add.php index 98b92be5fa3..de4af695c89 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php index da5b8bd7cf6..f4a11102af9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php index 978b89fbdea..017cebff2aa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php index 4b94571d8e1..36939d18364 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index 7dac93b6d4a..a7a3aaf3920 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +82,6 @@ protected function _prepareColumns() 'header' => Mage::helper('review')->__('Created On'), 'align' => 'left', 'type' => 'datetime', - 'width' => '100px', 'filter_index' => 'rt.created_at', 'index' => 'review_created_at', ]); 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..38f150a3cb8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,9 +26,11 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Review_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { + /** + * @return array + */ protected function _getOptions() { return [ @@ -38,6 +41,9 @@ protected function _getOptions() ]; } + /** + * @return int + */ public function getCondition() { if ($this->getValue() == 1) { 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..a2463b9d761 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,20 +26,25 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Review_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { + /** + * @param Mage_Catalog_Model_Product $row + * @return string + */ public function render(Varien_Object $row) { if (is_null($row->getCustomerId())) { if ($row->getStoreId() == Mage_Core_Model_App::ADMIN_STORE_ID) { return Mage::helper('review')->__('Administrator'); - } else { - return Mage::helper('review')->__('Guest'); } - } elseif ($row->getCustomerId() > 0) { + return Mage::helper('review')->__('Guest'); + } + + if ($row->getCustomerId() > 0) { return Mage::helper('review')->__('Customer'); } - //return ($row->getCustomerId() ? Mage::helper('review')->__('Customer') : Mage::helper('review')->__('Guest')); + + return ''; } } diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Main.php b/app/code/core/Mage/Adminhtml/Block/Review/Main.php index 60d67708e84..a2f0e92b5ee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Main.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Main extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php index 31aff54ddd9..7178d352ce7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php index ed025082c29..2c61f86e6c5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php index 38f995d4ed0..67be5a81ae9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Adminhtml/Block/Sales.php index 14e0383724f..569b65f35ff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Creditmemo.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php index 629283cbf55..5be3f296e09 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php index c25fb016e9e..f54c9ae1ac9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,6 +46,10 @@ protected function _getCollectionClass() return 'sales/order_creditmemo_grid_collection'; } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { $collection = Mage::getResourceModel($this->_getCollectionClass()); @@ -52,6 +57,10 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareColumns() { $this->addColumn('increment_id', [ @@ -99,7 +108,8 @@ protected function _prepareColumns() 'currency' => 'order_currency_code', ]); - $this->addColumn('action', + $this->addColumn( + 'action', [ 'header' => Mage::helper('sales')->__('Action'), 'width' => '50px', @@ -115,7 +125,8 @@ protected function _prepareColumns() 'filter' => false, 'sortable' => false, 'is_system' => true - ]); + ] + ); $this->addExportType('*/*/exportCsv', Mage::helper('sales')->__('CSV')); $this->addExportType('*/*/exportExcel', Mage::helper('sales')->__('Excel XML')); @@ -123,6 +134,9 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @return $this + */ protected function _prepareMassaction() { $this->setMassactionIdField('entity_id'); @@ -137,19 +151,27 @@ protected function _prepareMassaction() return $this; } + /** + * @param Mage_Sales_Model_Order_Creditmemo $row + * @return false|string + */ public function getRowUrl($row) { if (!Mage::getSingleton('admin/session')->isAllowed('sales/order/creditmemo')) { return false; } - return $this->getUrl('*/sales_creditmemo/view', + return $this->getUrl( + '*/sales_creditmemo/view', [ 'creditmemo_id'=> $row->getId(), ] ); } + /** + * @return string + */ public function getGridUrl() { return $this->getUrl('*/*/*', ['_current' => true]); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php index d0e7f56606c..5b4465f5566 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Invoice extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'sales_invoice'; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php index 456a22221f3..c68a1f73823 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,6 +48,10 @@ protected function _getCollectionClass() return 'sales/order_invoice_grid_collection'; } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { $collection = Mage::getResourceModel($this->_getCollectionClass()); @@ -54,6 +59,10 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareColumns() { $this->addColumn('increment_id', [ @@ -101,7 +110,8 @@ protected function _prepareColumns() 'currency' => 'order_currency_code', ]); - $this->addColumn('action', + $this->addColumn( + 'action', [ 'header' => Mage::helper('sales')->__('Action'), 'width' => '50px', @@ -117,7 +127,8 @@ protected function _prepareColumns() 'filter' => false, 'sortable' => false, 'is_system' => true - ]); + ] + ); $this->addExportType('*/*/exportCsv', Mage::helper('sales')->__('CSV')); $this->addExportType('*/*/exportExcel', Mage::helper('sales')->__('Excel XML')); @@ -125,6 +136,9 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @return $this + */ protected function _prepareMassaction() { $this->setMassactionIdField('entity_id'); @@ -139,19 +153,27 @@ protected function _prepareMassaction() return $this; } + /** + * @param Mage_Sales_Model_Order_Invoice $row + * @return false|string + */ public function getRowUrl($row) { if (!Mage::getSingleton('admin/session')->isAllowed('sales/order/invoice')) { return false; } - return $this->getUrl('*/sales_invoice/view', + return $this->getUrl( + '*/sales_invoice/view', [ 'invoice_id'=> $row->getId(), ] ); } + /** + * @return string + */ public function getGridUrl() { return $this->getUrl('*/*/grid', ['_current' => true]); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php index 2aed9d43943..35077383124 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,7 +51,7 @@ class Mage_Adminhtml_Block_Sales_Items_Abstract extends Mage_Adminhtml_Block_Te /** * Flag - if it is set method canEditQty will return value of it * - * @var boolean | null + * @var bool | null */ protected $_canEditQty = null; @@ -131,7 +132,7 @@ public function getItemRenderer($type) * * @param string $column * @param string $compositePart - * @return Mage_Core_Block_Abstract + * @return false|Mage_Core_Block_Abstract */ public function getColumnRenderer($column, $compositePart='') { @@ -297,7 +298,7 @@ public function displayPriceAttribute($code, $strong = false, $separator = '
*/ class Mage_Adminhtml_Block_Sales_Items_Column_Qty extends Mage_Adminhtml_Block_Sales_Items_Column_Default -{} +{ +} diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php index 2f6ff3288e8..5b3ef6ac0a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php index 1faf3f6d08f..6c891185ce0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php index f41770cb2d1..fbb63dc6195 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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 extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'sales_order'; @@ -43,5 +42,4 @@ public function getCreateUrl() { return $this->getUrl('*/sales_order_create/start'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php index 071ecbc4301..9c54a1a04fc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php index c72c132693a..acfccf1ed59 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php index b860eef6c0e..bbec20264af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +48,7 @@ protected function _getAddress() /** * Define form attributes (id, method, action) * - * @return Mage_Adminhtml_Block_Sales_Order_Create_Billing_Address + * @return $this */ protected function _prepareForm() { 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..acf9ec84252 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,9 +41,7 @@ protected function _beforeToHtml() } /** - * Prepare child blocks - * - * @return Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items + * @inheritDoc */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php index b9bc607479e..6bd02728b2a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +68,7 @@ public function __construct() /** * Check access for cancel action * - * @return boolean + * @return bool */ protected function _isCanCancel() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php index 11b67614909..b0f976cef10 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php index c60d90d9553..f4f6e8540a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,7 +79,7 @@ public function getFormValues() /** * Return customer address id * - * @return int|boolean + * @return int|bool */ public function getAddressId() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php index b6fe4493a25..8f9c8e95b66 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Billing_Method extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php index 428c9b9c870..690429fe6ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Comment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php index 7f11d78bd5c..ce8c239797a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Coupons.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php index fc25ada0573..ec49f86f5db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Coupons/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php index be1ca7cb548..89a5391a439 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Customer.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php index 5f02ac93da5..346e537750b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php index 7c49aa40355..d77b95568bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Data.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php index 4e3ed022f46..57c03eb3925 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php index 16d146a1012..026b9efce11 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php index 256cb740b7b..d97e29136b0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form/Account.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php index 79b20f3f6fb..86a5a741bfb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php index ca04f3195e3..e4bbc5a662e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -206,7 +207,7 @@ public function getAddressId() } /** - * Return customer address formated as one-line string + * Return customer address formatted as one-line string * * @param Mage_Customer_Model_Address $address * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index 098446e7c33..0e84b0a1360 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +46,7 @@ public function getFormHtml(Varien_Object $entity, $entityType='quote') { * * If no items available return false. * - * @return array|boolean + * @return array|bool */ public function getItems() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 1e6e731b7fa..9d3a1903e72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php index a64eb945756..dcd193b8fee 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) * @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/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php index aa3a224388d..da92353cefc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Items extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { /** @@ -102,5 +102,4 @@ protected function _toHtml() } return ''; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php index 508490318df..663372dccd8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -304,7 +305,7 @@ public function getTierHtml($item) * Get Custom Options of item * * @param Mage_Sales_Model_Quote_Item $item - * @return array + * @return string */ public function getCustomOptions(Mage_Sales_Model_Quote_Item $item) { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php index e3cc144d18f..489bcd438a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php index 32f7ec2920c..78edaac3a56 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,11 +28,9 @@ */ class Mage_Adminhtml_Block_Sales_Order_Create_Messages extends Mage_Adminhtml_Block_Messages { - public function _prepareLayout() { $this->addMessages(Mage::getSingleton('adminhtml/session_quote')->getMessages(true)); return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php index 97c34b838c7..39ee6dc423b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Newsletter extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php index 77de4b2bcac..a3042c3d8e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php index a8b7ad99f8d..76e3c1716af 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,10 +26,8 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Search extends Mage_Adminhtml_Block_Sales_Order_Create_Abstract { - public function __construct() { parent::__construct(); @@ -54,5 +53,4 @@ public function getHeaderCssClass() { return 'head-catalog-product'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php index 3e7066c3185..d41e35db099 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -103,13 +104,14 @@ protected function _prepareCollection() ->setStore($this->getStore()) ->addAttributeToSelect($attributes) ->addAttributeToSelect('sku') + ->addAttributeToSelect('gift_message_available') ->addStoreFilter() ->addAttributeToFilter('type_id', array_keys( Mage::getConfig()->getNode('adminhtml/sales/order/create/available_product_types')->asArray() )) - ->addAttributeToSelect('gift_message_available'); - - Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($collection); + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds() + ]); $this->setCollection($collection); return parent::_prepareCollection(); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php index 57bdd28ca32..3f6ba0c27b4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php index 2f9451513cd..e33a180c4e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,5 +41,4 @@ public function render(Varien_Object $row) } return parent::render($row); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php index d9f9dd1d5aa..3dbbe1fde3e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -30,7 +31,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid_Renderer_Product exten /** * Render product name to add Configure link * - * @param Varien_Object $row + * @param Mage_Catalog_Model_Product $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php index 63e2e249190..13808ed015b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Shipping/Address.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php index 8150392fc65..5dab6c613d0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +69,7 @@ protected function _prepareForm() /** * Return is shipping address flag * - * @return boolean + * @return bool */ public function getIsShipping() { @@ -78,7 +79,7 @@ public function getIsShipping() /** * Same as billing address flag * - * @return boolean + * @return bool */ public function getIsAsBilling() { @@ -108,7 +109,7 @@ public function getFormValues() /** * Return customer address id * - * @return int|boolean + * @return int|bool */ public function getAddressId() { @@ -134,7 +135,7 @@ public function getAddress() * Return is address disabled flag * Return true is the quote is virtual * - * @return boolean + * @return bool */ public function getIsDisabled() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php index 05d04a405e6..5bf0824115d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Shipping_Method 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/Shipping/Method/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php index c1f6abcdb87..212ac224d99 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..c947791baed 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php index 7c1da4ba4a1..d27de1f35b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,13 +48,16 @@ public function getSidebarStorageAction() /** * Retrieve display block availability * - * @return bool + * @return int */ public function canDisplay() { return $this->getCustomerId(); } + /** + * @return bool + */ public function canDisplayItemQty() { return false; @@ -137,12 +141,12 @@ public function getItems() /* * Filtering items by allowed product type */ - foreach($items as $key => $item) { + foreach ($items as $key => $item) { if ($item instanceof Mage_Catalog_Model_Product) { $type = $item->getTypeId(); - } else if ($item instanceof Mage_Sales_Model_Order_Item) { + } elseif ($item instanceof Mage_Sales_Model_Order_Item) { $type = $item->getProductType(); - } else if ($item instanceof Mage_Sales_Model_Quote_Item) { + } elseif ($item instanceof Mage_Sales_Model_Quote_Item) { $type = $item->getProductType(); } else { $type = ''; @@ -173,6 +177,9 @@ public function getItemCollection() return false; } + /** + * @return bool + */ public function canDisplayPrice() { return true; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php index 757692c3e2d..836c416c58e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Compared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php index 819e07e2dcb..bc661f44971 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Pcompared.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php index 25e8d233b60..f8e89546dbb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Pcompared extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php index 907b02fef37..eb61b7a7e63 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Pviewed extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php index 339bf12995f..7fb3f904c87 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Reorder extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { - /** * Storage action on selected item * @@ -42,6 +42,9 @@ protected function _construct() $this->setDataId('reorder'); } + /** + * @return string + */ public function getHeaderText() { return Mage::helper('sales')->__('Last Ordered Items'); @@ -70,7 +73,7 @@ public function getLastOrder() /** * Retrieve item collection * - * @return mixed + * @return array|false */ public function getItemCollection() { @@ -86,16 +89,25 @@ public function getItemCollection() return false; } + /** + * @return false + */ public function canDisplayItemQty() { return false; } + /** + * @return false + */ public function canRemoveItems() { return false; } + /** + * @return false + */ public function canDisplayPrice() { return false; 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..3cbc37629ae 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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(); @@ -38,7 +37,7 @@ protected function _construct() /** * Retrieve display block availability * - * @return bool + * @return int|false */ public function canDisplay() { @@ -48,16 +47,18 @@ public function canDisplay() /** * Retrieve availability removing items in block * - * @return bool + * @return false */ public function canRemoveItems() { return false; } + /** + * @return string + */ 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..1cab53c5842 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,8 +26,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Wishlist - extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract +class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Wishlist extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract { /** * Storage action on selected item @@ -42,6 +42,9 @@ protected function _construct() $this->setDataId('wishlist'); } + /** + * @return string + */ public function getHeaderText() { return Mage::helper('sales')->__('Wishlist'); @@ -105,7 +108,7 @@ public function getIdentifierId($item) } /** - * @inheritDoc + * @return false|int */ public function canDisplay() { 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..14e9ada3d9e 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Store/Select.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php index e79c92f37c5..46f0f26a072 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales order create select store block * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Create_Store_Select extends Mage_Adminhtml_Block_Store_Switcher { public function __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..c68369625ce 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php index 3dc90d32f1b..917410dffdd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Totals/Discount.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php index 24a6b58978d..e280cfbf43f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Totals/Grandtotal.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php index e004d169eea..4e54cda2bf0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Totals/Shipping.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php index b1e16044324..163c6650476 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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 { @@ -73,7 +74,7 @@ public function getShippingExcludeTax() /** * Get label for shipping include tax * - * @return float + * @return string */ public function getIncludeTaxLabel() { @@ -83,7 +84,7 @@ public function getIncludeTaxLabel() /** * Get label for shipping exclude tax * - * @return float + * @return string */ public function getExcludeTaxLabel() { 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..31166957ead 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 @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..27732cc9e06 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..f7b7eeb064e 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 @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php index 7c501f498ca..1b3e1f4ec08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Create/Adjustments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php index f3af34f6f0e..d379aa7639e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php index c9bf774eb4b..54e9ccc7afa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +41,7 @@ public function getOrder() /** * Retrieve source * - * @return Mage_Sales_Model_Order_Invoice + * @return Mage_Sales_Model_Order_Creditmemo */ public function getSource() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php index a05cf3e0329..3d118bc87c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Creditmemo_Create_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract { protected $_canReturnToStock; 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..00469559ef1 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..d300a8d20ad 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php index 5f6ce8336c6..70ade78c57a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php index 8f4717a4b1b..d88349edc0d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php index f60269798d7..23946f225c4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php index 4dfc0573a1d..b47e370b0a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,6 +48,10 @@ protected function _getCollectionClass() return 'sales/order_grid_collection'; } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { $collection = Mage::getResourceModel($this->_getCollectionClass()); @@ -54,9 +59,12 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @inheritDoc + * @throws Mage_Core_Model_Store_Exception + */ protected function _prepareColumns() { - $this->addColumn('real_order_id', [ 'header' => Mage::helper('sales')->__('Order #'), 'width' => '100px', @@ -80,7 +88,6 @@ protected function _prepareColumns() 'header' => Mage::helper('sales')->__('Purchased On'), 'index' => 'created_at', 'type' => 'datetime', - 'width' => '150px', ]); $this->addColumn('billing_name', [ @@ -116,7 +123,8 @@ protected function _prepareColumns() ]); if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) { - $this->addColumn('action', + $this->addColumn( + 'action', [ 'header' => Mage::helper('sales')->__('Action'), 'width' => '50px', @@ -134,7 +142,8 @@ protected function _prepareColumns() 'sortable' => false, 'index' => 'stores', 'is_system' => true, - ]); + ] + ); } $this->addRssList('rss/order/new', Mage::helper('sales')->__('New Order RSS')); @@ -144,6 +153,9 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @return $this + */ protected function _prepareMassaction() { $this->setMassactionIdField('entity_id'); @@ -199,6 +211,10 @@ protected function _prepareMassaction() return $this; } + /** + * @param Mage_Sales_Model_Order $row + * @return false|string + */ public function getRowUrl($row) { if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) { @@ -207,6 +223,9 @@ public function getRowUrl($row) return false; } + /** + * @return string + */ public function getGridUrl() { return $this->getUrl('*/*/grid', ['_current'=>true]); diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php index 70465d455bc..0aeda311504 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php index 644c04ddedd..57338331ed7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,7 +117,7 @@ public function canShipPartiallyItem() /** * Return forced creating of shipment flag * - * @return integer + * @return int */ public function getForcedShipmentCreate() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php index 9bf980939cd..18d58a7dad2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract { protected $_disableSubmitButton = false; @@ -79,7 +79,7 @@ protected function _beforeToHtml() /** * Get is submit button disabled or not * - * @return boolean + * @return bool */ public function getDisableSubmitButton() { 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..d6ce111b6b7 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7de3fd307c9 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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..2806eb14312 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php index bf415c56162..eb12103ad97 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php index add9cb70db8..255a0850252 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,7 +67,7 @@ public function getOrderUrl() } /** - * Retrieve formated price + * Retrieve formatted price * * @param float $price * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php index 22063f6da73..6d59dfcb77e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -66,7 +67,7 @@ public function getOrderUrl() } /** - * Retrieve formated price + * Retrieve formatted price * * @param float $price * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php index 51cf0758424..dd082048b91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,5 +52,4 @@ protected function _toHtml() { return $this->getChildHtml('info'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php index f74721c6559..ad429645971 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php index 4dbedffb7b2..61d28817329 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +41,7 @@ public function getOrder() /** * Retrieve source * - * @return Mage_Sales_Model_Order_Invoice + * @return Mage_Sales_Model_Order_Shipment */ public function getSource() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php index 3e20ad41668..01e24878138 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract { /** @@ -41,7 +41,7 @@ public function getOrder() /** * Retrieve source * - * @return Mage_Sales_Model_Order_Invoice + * @return Mage_Sales_Model_Order_Shipment */ public function getSource() { 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..7a056b9959e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Packaging.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php index 702eebc7f69..eddc33515d1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Sales_Order_Shipment_Packaging extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php index f10cb6559b3..0ce662754d3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @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/Tracking/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php index fbd5c3de1fe..454796c0a6e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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..55b5ce37ea3 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Comments.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php index 3e27b063235..c54409ed1df 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php index 2ca18466bd1..8b03c8d37c6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php index b4a064c1fa1..00608974db9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bfb0a34a4cc 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..fbc136ff32d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php index bdada826f41..cc13ce23a03 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php index bd7ba8b771b..1763454e83d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php index bea9a89317a..74bd8380f23 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php index 8be86d7d260..9d1dfed8251 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php index 19b9cb4d3a3..1c55d2731f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/New.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php index 95ed9f7ac62..44e3d5ba919 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php @@ -7,20 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Sales_Order_Status_New extends Mage_Adminhtml_Block_Widget_Form_Container { - public function __construct() { $this->_objectId = 'status'; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php index d1b6eef686f..68db21ab101 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -99,7 +100,7 @@ protected function _prepareForm() 'name' => 'store_labels['.$store->getId().']', 'required' => false, 'label' => $store->getName(), - 'value' => isset($labels[$store->getId()]) ? $labels[$store->getId()] : '', + 'value' => $labels[$store->getId()] ?? '', 'fieldset_html_class' => 'store', ]); } 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..a60af241ff2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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..efa7afa3046 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Item.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php index 14cc51052cf..ff537da5048 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** - * Totals item block - */ +/** + * Totals item block + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Block_Sales_Order_Totals_Item extends Mage_Adminhtml_Block_Sales_Order_Totals { /** 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..fcfa53c2b25 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7882e372e52 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php index ed53db8f5b3..f8c2ee88cda 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index f95f4d59c82..4186a461c4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +31,7 @@ class Mage_Adminhtml_Block_Sales_Order_View_Giftmessage extends Mage_Adminhtml_B /** * Entity for editing of gift message * - * @var Mage_Eav_Model_Entity_Abstract + * @var Mage_Sales_Model_Order */ protected $_entity; @@ -99,7 +100,7 @@ public function getSaveButtonHtml() /** * Set entity for form * - * @param Varien_Object $entity + * @param Mage_Sales_Model_Order $entity * @return $this */ public function setEntity(Varien_Object $entity) @@ -111,7 +112,7 @@ public function setEntity(Varien_Object $entity) /** * Retrieve entity for form * - * @return Varien_Object + * @return Mage_Sales_Model_Order * @throws Exception */ public function getEntity() @@ -278,7 +279,7 @@ public function getHtmlId() /** * Indicates that block can display giftmessages form * - * @return boolean + * @return bool * @throws Exception */ public function canDisplayGiftmessage() diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php index fd5ba8103ae..cf67afb3557 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,7 +77,7 @@ public function getSubmitUrl() * Customer Notification Applicable check method * * @param Mage_Sales_Model_Order_Status_History $history - * @return boolean + * @return bool */ public function isCustomerNotificationNotApplicable(Mage_Sales_Model_Order_Status_History $history) { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php index b7e7994c91e..6c5697f0132 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php index 9504a3e8daf..b2cbe6401f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index 5423f939e81..193a9f69df1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +57,7 @@ public function getFieldIdPrefix() /** * Indicate that block can display container * - * @return boolean + * @return bool * @throws Exception */ public function canDisplayContainer() @@ -179,8 +180,8 @@ public function getMessage() /** * Retrieve save url * + * @return string * @deprecated after 1.4.2.0 - * @return array */ public function getSaveUrl() { @@ -206,7 +207,7 @@ public function getHtmlId() * Indicates that block can display giftmessages form * * @deprecated after 1.4.2.0 - * @return boolean + * @return bool */ public function canDisplayGiftmessage() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php index 627c68814cc..3f86dd9ad9a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_View_Messages extends Mage_Adminhtml_Block_Messages { - protected function _getOrder() { return Mage::registry('sales_order'); @@ -50,5 +50,4 @@ public function _prepareLayout() return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php index cd3f2f1954e..2b08f8b1d3f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php index ec67490f2f7..43c144b381d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -162,7 +163,7 @@ public function getItemTitle(array $item) * Check whether status history comment is with customer notification * * @param array $item - * @param boolean $isSimpleCheck + * @param bool $isSimpleCheck * @return bool */ public function isItemNotified(array $item, $isSimpleCheck = true) @@ -263,7 +264,7 @@ public function getTabUrl() /** * Can Show Tab * - * @return boolean + * @return bool */ public function canShowTab() { @@ -273,7 +274,7 @@ public function canShowTab() /** * Is Hidden * - * @return boolean + * @return bool */ public function isHidden() { @@ -284,7 +285,7 @@ public function isHidden() * Customer Notification Applicable check method * * @param array $historyItem - * @return boolean + * @return bool */ public function isCustomerNotificationNotApplicable($historyItem) { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php index 95a43a7c39d..bba19c8588f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Invoices.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php index 772075bc2f6..0a316ad22dc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..83e96cb639d 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..fcd7a0663d2 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7d0201360f6 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php index 0611c860839..011036c339f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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..77086e49a1a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Shipment/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php index a18c4e6ff0a..9a7501d6411 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,7 +64,7 @@ protected function _prepareCollection() /** * Prepare and add columns to grid * - * @return Mage_Adminhtml_Block_Widget_Grid + * @inheritDoc */ protected function _prepareColumns() { @@ -130,8 +131,8 @@ protected function _prepareColumns() /** * Get url for row * - * @param string $row - * @return string + * @param Mage_Sales_Model_Order_Shipment $row + * @return string|false */ public function getRowUrl($row) { @@ -139,11 +140,7 @@ public function getRowUrl($row) return false; } - return $this->getUrl('*/sales_shipment/view', - [ - 'shipment_id'=> $row->getId(), - ] - ); + return $this->getUrl('*/sales_shipment/view', ['shipment_id' => $row->getId()]); } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php index 1168962f512..f19a4bfbdad 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Totals.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..19adba8ea65 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php index 6c23d5243a8..5bda246bcbe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php index b08a1556a7e..7620f13471e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php index 18870a0b70d..307df204a91 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php index 24444931120..a7ca68ef78e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -120,7 +121,6 @@ protected function _prepareColumns() $this->addColumn('created_at', [ 'header' => Mage::helper('sales')->__('Created At'), 'index' => 'created_at', - 'width' => 1, 'type' => 'datetime', 'align' => 'center', 'default' => $this->__('N/A'), diff --git a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php index b888114072a..3cb36005c95 100644 --- a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,9 +91,7 @@ public function setConditionName($name) } /** - * Retrieve current website id - * - * @return int + * @return string */ public function getConditionName() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap.php b/app/code/core/Mage/Adminhtml/Block/Sitemap.php index 58a452985ad..ce09395514d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap.php @@ -7,26 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml catalog (google) sitemaps block * * @category Mage - * @package Mage_Sitemap + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap extends Mage_Adminhtml_Block_Widget_Grid_Container { - /** * Block constructor */ @@ -37,5 +38,4 @@ public function __construct() $this->_addButtonLabel = Mage::helper('sitemap')->__('Add Sitemap'); parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php index 6076a8c6730..8db1d040294 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php index 00cd5b8a2be..759680a98bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php index aebc842c34f..2f043bc47b9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,7 +70,6 @@ protected function _prepareColumns() $this->addColumn('sitemap_time', [ 'header' => Mage::helper('sitemap')->__('Last Time Generated'), - 'width' => '150px', 'index' => 'sitemap_time', 'type' => 'datetime', ]); diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php index c453d81a648..d6f64c9ee3d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php index b985f95c76b..da4ac2b2d50 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sitemap grid link column renderer * * @category Mage - * @package Mage_Sitemap + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Link extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { @@ -45,5 +47,4 @@ public function render(Varien_Object $row) } return $url; } - } 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..81aceaf75ae 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 @@ -7,26 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sitemap grid link column renderer * * @category Mage - * @package Mage_Sitemap + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Time extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - /** * Prepare link to display in grid * @@ -35,7 +36,9 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Time extends Mage_Adminhtml_Blo */ public function render(Varien_Object $row) { - return date('Y-m-d H:i:s', strtotime($row->getSitemapTime()) + Mage::getSingleton('core/date')->getGmtOffset()); + return date( + Varien_Date::DATETIME_PHP_FORMAT, + strtotime($row->getSitemapTime()) + Mage::getSingleton('core/date')->getGmtOffset() + ); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php index 4f3ed54c85c..bf3b24cde6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php index 62ffea4d0a8..8d3433e14fe 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php index 008a296f064..4842fa27eff 100644 --- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Account/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php index 17959f24f11..51504afba0e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Account/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php index e389dfbd2a2..6f2c7df1d79 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php index 8b29c098cde..c28790c6f54 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php index 10143724bf8..795ba969fa3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php index 0ffddb7f6ed..1d9a7aa5deb 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php index 0701821fb37..e56b10b09f2 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php index 50798a97e38..76a84fcaf94 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -544,7 +545,7 @@ protected function _afterToHtml($html) /** * @param Varien_Simplexml_Element $a * @param Varien_Simplexml_Element $b - * @return boolean + * @return int */ protected function _sortForm($a, $b) { @@ -554,7 +555,7 @@ protected function _sortForm($a, $b) /** * @param Varien_Simplexml_Element $field - * @return boolean + * @return bool */ public function canUseDefaultValue($field) { @@ -569,7 +570,7 @@ public function canUseDefaultValue($field) /** * @param Varien_Simplexml_Element $field - * @return boolean + * @return bool */ public function canUseWebsiteValue($field) { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index 75449b81f10..a126c8d6ac0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php index a133fdaf3c0..6c42c0d9063 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -135,7 +136,7 @@ public function getArrayRows() return $this->_arrayRowsCache; } $result = []; - /** @var Varien_Data_Form_Element_Abstract */ + /** @var Varien_Data_Form_Element_Abstract $element */ $element = $this->getElement(); if ($element->getValue() && is_array($element->getValue())) { foreach ($element->getValue() as $rowId => $row) { @@ -172,7 +173,7 @@ protected function _renderCellTemplate($columnName) return ''; } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php index 2e12e47b706..ba506b342c7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php index 900b9ade244..3260e9c26df 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php index a2c41ffb368..7dbce7c603b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php index 1162b32ac73..2200d82e6a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php index 34c3738a56e..4286a613fc8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php index 2583e92a404..54afc607409 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php index ed7629cd733..6fd04a03fe5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php index ae9858d3c1c..f525b65ca72 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php index c62c49e39e1..8045526546a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php index ae0ab0413b8..257b25fda73 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php index 7cadf34258d..ecc0e288102 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php index 668f75ae9e9..a9fc8e826cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -191,7 +192,7 @@ protected function _getExtraJs($element, $tooltipsExist = false) * Collapsed or expanded fieldset when page loaded? * * @param Varien_Data_Form_Element_Abstract $element - * @return bool + * @return int|bool */ protected function _getCollapseState($element) { @@ -199,9 +200,6 @@ protected function _getCollapseState($element) return 1; } $extra = Mage::getSingleton('admin/session')->getUser()->getExtra(); - if (isset($extra['configState'][$element->getId()])) { - return $extra['configState'][$element->getId()]; - } - return false; + return $extra['configState'][$element->getId()] ?? false; } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php index da23e76c8d5..44264c965ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..4877d7bdb2b 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -59,7 +65,7 @@ protected function _getFieldHtml($fieldset, $id, $status) { $configData = $this->getConfigData(); $path = 'sales/order_statuses/status_'.$id; //TODO: move as property of form - $data = isset($configData[$path]) ? $configData[$path] : []; + $data = $configData[$path] ?? []; $e = $this->_getDummyElement(); @@ -67,15 +73,14 @@ protected function _getFieldHtml($fieldset, $id, $status) [ 'name' => 'groups[order_statuses][fields][status_'.$id.'][value]', 'label' => $status, - 'value' => isset($data['value']) ? $data['value'] : $status, - 'default_value' => isset($data['default_value']) ? $data['default_value'] : '', - 'old_value' => isset($data['old_value']) ? $data['old_value'] : '', - 'inherit' => isset($data['inherit']) ? $data['inherit'] : '', + 'value' => $data['value'] ?? $status, + 'default_value' => $data['default_value'] ?? '', + 'old_value' => $data['old_value'] ?? '', + 'inherit' => $data['inherit'] ?? '', 'can_use_default_value' => $this->getForm()->canUseDefaultValue($e), 'can_use_website_value' => $this->getForm()->canUseWebsiteValue($e), ])->setRenderer($this->_getFieldRenderer()); 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 2a49bcad070..8573ea8051e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..e14b7a03a38 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 ca0818842e7..36c25f021a5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,8 +29,6 @@ class Mage_Adminhtml_Block_System_Config_Tabs extends Mage_Adminhtml_Block_Widget { /** - * Tabs - * * @var array */ protected $_tabs; @@ -153,11 +152,7 @@ public function addTab($code, $config) */ public function getTab($code) { - if(isset($this->_tabs[$code])) { - return $this->_tabs[$code]; - } - - return null; + return $this->_tabs[$code] ?? null; } /** @@ -309,7 +304,7 @@ public function getStoreButtonsHtml() /** * @param string $code - * @return boolean + * @return bool */ public function checkSectionPermissions($code=null) { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php index d9eab8b1d9f..d71d6650375 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php index 3517a682648..d51f1715e5a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php index 10c509579d3..947e7b0f670 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Upload.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php index 8e4a5a3f6a7..d7c673f85fa 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..ad84b639fac 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..58c90b2f80a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,19 +28,29 @@ */ class Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard extends Mage_Adminhtml_Block_Widget_Container { - protected $_storeModel; protected $_attributes; protected $_addMapButtonHtml; protected $_removeMapButtonHtml; protected $_shortDateFormat; + /** + * @var array + */ + protected $_filterStores; + + /** + * Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard constructor. + */ public function __construct() { parent::__construct(); $this->setTemplate('system/convert/profile/wizard.phtml'); } + /** + * @return $this + */ protected function _prepareLayout() { if ($head = $this->getLayout()->getBlock('head')) { @@ -48,6 +59,10 @@ protected function _prepareLayout() return $this; } + /** + * @param string $entityType + * @return array|string[] + */ public function getAttributes($entityType) { if (!isset($this->_attributes[$entityType])) { @@ -63,13 +78,19 @@ public function getAttributes($entityType) break; } - array_splice($attributes, 0, 0, [''=>$this->__('Choose an attribute')]); + array_splice($attributes, 0, 0, ['' => $this->__('Choose an attribute')]); $this->_attributes[$entityType] = $attributes; } return $this->_attributes[$entityType]; } - public function getValue($key, $default='', $defaultNew = null) + /** + * @param string $key + * @param string $default + * @param string|null $defaultNew + * @return string + */ + public function getValue($key, $default = '', $defaultNew = null) { if ($defaultNew !== null) { if ($this->getProfileId() == 0) { @@ -81,9 +102,14 @@ public function getValue($key, $default='', $defaultNew = null) return $this->escapeHtml(strlen($value) > 0 ? $value : $default); } + /** + * @param string $key + * @param string $value + * @return string + */ public function getSelected($key, $value) { - return $this->getData($key)==$value ? 'selected="selected"' : ''; + return $this->getData($key) == $value ? 'selected="selected"' : ''; } public function getChecked($key) @@ -91,12 +117,19 @@ public function getChecked($key) return $this->getData($key) ? 'checked="checked"' : ''; } + /** + * @param string $entityType + * @return array + */ public function getMappings($entityType) { $maps = $this->getData('gui_data/map/'.$entityType.'/db'); - return $maps ? $maps : []; + return $maps ?: []; } + /** + * @return string + */ public function getAddMapButtonHtml() { if (!$this->_addMapButtonHtml) { @@ -107,6 +140,9 @@ public function getAddMapButtonHtml() return $this->_addMapButtonHtml; } + /** + * @return string + */ public function getRemoveMapButtonHtml() { if (!$this->_removeMapButtonHtml) { @@ -117,6 +153,9 @@ public function getRemoveMapButtonHtml() return $this->_removeMapButtonHtml; } + /** + * @return array + */ public function getProductTypeFilterOptions() { $options = Mage::getSingleton('catalog/product_type')->getOptionArray(); @@ -124,6 +163,9 @@ public function getProductTypeFilterOptions() return $options; } + /** + * @return array + */ public function getProductAttributeSetFilterOptions() { $options = Mage::getResourceModel('eav/entity_attribute_set_collection') @@ -131,46 +173,52 @@ public function getProductAttributeSetFilterOptions() ->load() ->toOptionHash(); - $opt = []; $opt = [''=>$this->__('Any Attribute Set')]; - if ($options) foreach($options as $index => $value) { - $opt[$index] = $value; + if ($options) { + foreach ($options as $index => $value) { + $opt[$index] = $value; + } } - //array_slice($options, 0, 0, array(''=>$this->__('Any Attribute Set'))); return $opt; } + /** + * @return array + */ public function getProductVisibilityFilterOptions() { $options = Mage::getSingleton('catalog/product_visibility')->getOptionArray(); - array_splice($options, 0, 0, [''=>$this->__('Any Visibility')]); return $options; } + /** + * @return array + */ public function getProductStatusFilterOptions() { $options = Mage::getSingleton('catalog/product_status')->getOptionArray(); - array_splice($options, 0, 0, [''=>$this->__('Any Status')]); return $options; } + /** + * @return array + */ public function getStoreFilterOptions() { if (!$this->_filterStores) { - #$this->_filterStores = array(''=>$this->__('Any Store')); $this->_filterStores = []; foreach (Mage::getConfig()->getNode('stores')->children() as $storeNode) { - if ($storeNode->getName()==='default') { - //continue; - } $this->_filterStores[$storeNode->getName()] = (string)$storeNode->system->store->name; } } return $this->_filterStores; } + /** + * @return array + */ public function getCustomerGroupFilterOptions() { $options = Mage::getResourceModel('customer/group_collection') @@ -182,6 +230,9 @@ public function getCustomerGroupFilterOptions() return $options; } + /** + * @return array + */ public function getCountryFilterOptions() { $options = Mage::getResourceModel('directory/country_collection') @@ -202,21 +253,33 @@ protected function _getStoreModel() { return $this->_storeModel; } + /** + * @return array + */ public function getWebsiteCollection() { return $this->_getStoreModel()->getWebsiteCollection(); } + /** + * @return array + */ public function getGroupCollection() { return $this->_getStoreModel()->getGroupCollection(); } + /** + * @return array + */ public function getStoreCollection() { return $this->_getStoreModel()->getStoreCollection(); } + /** + * @return string + */ public function getShortDateFormat() { if (!$this->_shortDateFormat) { @@ -226,6 +289,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..a21ccb13bb3 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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(); @@ -70,8 +68,7 @@ protected function _beforeToHtml() 'content' => $this->getLayout()->createBlock('adminhtml/system_convert_profile_edit_tab_run')->toHtml(), ]); - /** @var Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View - $block */ + /** @var Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View $block */ $block = $this->getLayout()->createBlock('adminhtml/system_convert_gui_edit_tab_view'); $this->addTab('view', [ 'label' => Mage::helper('adminhtml')->__('Profile Actions XML'), diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php index 178db5b0b57..1049f972261 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php index 40bc1bce2e1..fbe7e02d866 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_System_Convert_Profile extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { $this->_controller = 'system_convert_profile'; @@ -36,6 +35,5 @@ public function __construct() parent::__construct(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php index d30e613c2a1..fcc98cbbde8 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php index 3ba32ef7249..58064e2f796 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php index 4bdbc9cb7a4..575b1b77d1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php index 3bfe6e1434f..d177ea3bd4f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php index 9acc23570bb..cad5450e7a3 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php index b66482420ae..e18a7a520be 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +69,6 @@ protected function _prepareColumns() 'header' => Mage::helper('adminhtml')->__('Performed At'), 'type' => 'datetime', 'index' => 'performed_at', - 'width' => '150px', ]); $this->addColumn('firstname', [ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php index 16bcc3a0acb..f39ce078fc0 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,23 +36,7 @@ public function __construct() public function getRunButtonHtml() { - $html = ''; -/* - if (Mage::registry('current_convert_profile')->getDirection()=='import') { - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button') - ->setLabel($this->__('Upload import file')) - ->setOnClick('showUpload()') - ->toHtml(); - } -*/ - /* - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button') - ->setClass('save')->setLabel($this->__('Run Profile Inside This Window')) - ->setOnClick('runProfile()') - ->toHtml(); - */ - - $html .= $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button') + $html = $this->getLayout()->createBlock('adminhtml/widget_button')->setType('button') ->setClass('save')->setLabel($this->__('Run Profile in Popup')) ->setOnClick('runProfile(true)') ->toHtml(); 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..0ed1fa2dcd7 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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/Convert/Profile/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php index b88ab0d318c..a7c1ced5f2a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php index aa74c6dff57..f52d8b0a99d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,7 +30,7 @@ class Mage_Adminhtml_Block_System_Convert_Profile_Run extends Mage_Adminhtml_Blo { /** * Flag for batch model - * @var boolean + * @var bool */ protected $_batchModelPrepared = false; /** diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency.php b/app/code/core/Mage/Adminhtml/Block/System/Currency.php index b27e6344945..9eb775994e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Currency/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php index 3a576516299..f41ca3d9783 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Currency/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php index ecd58c78072..a962f01cf7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +28,4 @@ */ class Mage_Adminhtml_Block_System_Currency_Edit_Tab_Main extends Mage_Adminhtml_Block_Widget_Form { - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php index 66d82dc118c..ed11daeef75 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +28,4 @@ */ class Mage_Adminhtml_Block_System_Currency_Edit_Tab_Rates extends Mage_Adminhtml_Block_Widget_Form { - } 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..66694e10cff 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Currency/Rate/Matrix.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php index 614180e0ce0..df12e58f4a6 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @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/Currency/Rate/Services.php b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php index daa998a9999..f2adfa8689b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_System_Currency_Rate_Services extends Mage_Adminhtml_Block_Template { - /** * Set import services template * @@ -56,5 +56,4 @@ protected function _prepareLayout() return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design.php b/app/code/core/Mage/Adminhtml/Block/System/Design.php index 158fe1df304..075fadce188 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php index 608e87884dd..98cfe86255d 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php index d62f4533cde..bac48fe7f1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php @@ -7,16 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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_Tab_General extends Mage_Adminhtml_Block_Widget_Form { protected function _prepareForm() 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..35e8cb05baf 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Design/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php index 9281183db94..5ceaafa8bdd 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,7 +81,6 @@ protected function _prepareColumns() $this->addColumn('date_from', [ 'header' => Mage::helper('catalogrule')->__('Date From'), 'align' => 'left', - 'width' => '100px', 'type' => 'date', 'index' => 'date_from', ]); @@ -88,7 +88,6 @@ protected function _prepareColumns() $this->addColumn('date_to', [ 'header' => Mage::helper('catalogrule')->__('Date To'), 'align' => 'left', - 'width' => '100px', 'type' => 'date', 'index' => 'date_to', ]); 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..82e8cc6c974 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,12 +26,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/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php index 253939c8a1a..3f0db3ce422 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -188,7 +189,7 @@ public function getLoadButtonHtml() /** * Return edit flag for block * - * @return boolean + * @return int|string */ public function getEditMode() { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php index e3746d9b4c9..c2ec52c885b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Email/Template/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php index 37f3dc5fbb4..08b387e4f4a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php index a939f249213..d6d86895a3a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,9 +26,7 @@ * @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 +class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { protected static $_types = [ null => null, @@ -35,6 +34,9 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type Mage_Newsletter_Model_Template::TYPE_TEXT => 'Text', ]; + /** + * @return array + */ protected function _getOptions() { $result = []; @@ -45,9 +47,12 @@ protected function _getOptions() return $result; } + /** + * @return array|null + */ public function getCondition() { - if(is_null($this->getValue())) { + if (is_null($this->getValue())) { return null; } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php index 179b6f402be..e8131379dae 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Email/Template/Grid/Renderer/Sender.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php index 66d1fd5b8a3..28a6a56b692 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Sender extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { public function render(Varien_Object $row) 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..0871a44129a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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 { @@ -35,13 +35,7 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Renderer_Type ]; public function render(Varien_Object $row) { - - $str = Mage::helper('adminhtml')->__('Unknown'); - - if(isset(self::$_types[$row->getTemplateType()])) { - $str = self::$_types[$row->getTemplateType()]; - } - + $str = self::$_types[$row->getTemplateType()] ?? Mage::helper('adminhtml')->__('Unknown'); return Mage::helper('adminhtml')->__($str); } } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php index 79f71b0757f..943ff112ea7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Store/Delete.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php index e9696c86e89..331231fae98 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store/Delete/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php index 447fad3c645..566ad08e3a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store/Delete/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php index df13c084ca6..eb48c19e6ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store/Delete/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php index d29da72123f..120df458e41 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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 +61,4 @@ protected function _prepareLayout() ); return parent::_prepareLayout(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php index aa9a2d93ca8..f6f7f95869a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php index d89e4d34682..9c71e59a3bb 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php index 2f39db3b1da..83bf2137306 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php index 78c056b1b5c..00e9bc4b8a1 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,9 +27,12 @@ * @author Magento Core Team * @deprecated after 1.13.1.0 use Mage_Adminhtml_Block_System_Store_Tree */ -class Mage_Adminhtml_Block_System_Store_Grid_Render_Group - extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +class Mage_Adminhtml_Block_System_Store_Grid_Render_Group extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { + /** + * @param Varien_Object $row + * @return string|null + */ public function render(Varien_Object $row) { if (!$row->getData($this->getColumn()->getIndex())) { 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..c06cf41e23c 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,10 +27,12 @@ * @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 +class Mage_Adminhtml_Block_System_Store_Grid_Render_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { + /** + * @param Varien_Object $row + * @return string|null + */ public function render(Varien_Object $row) { if (!$row->getData($this->getColumn()->getIndex())) { 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..605aa3f83ca 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,16 +27,16 @@ * @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 +class Mage_Adminhtml_Block_System_Store_Grid_Render_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - + /** + * @param Varien_Object $row + * @return string + */ 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..9ed8000db3e 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Store.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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..02e9094d093 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2c8ed835b2f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/System/Variable/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php index c75dfe94289..c1fcb0bf03b 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,10 +44,7 @@ public function getVariable() } /** - * Prepare layout. - * Adding save_and_continue button - * - * @return $this + * @inheritDoc */ protected function _preparelayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php index 1572bfb94ca..29287f4e472 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid.php b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php index 6bbf274e822..d29835c3c9a 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Block/Tag.php index de51f353196..072fbe3bb83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Assigned/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php index 2f9164844db..c27191da251 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php index 5e09fda7346..58d13324eed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,10 @@ */ class Mage_Adminhtml_Block_Tag_Customer extends Mage_Adminhtml_Block_Widget_Grid_Container { + /** + * Mage_Adminhtml_Block_Tag_Customer constructor. + * @throws Exception + */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php index 94ab6628d79..f55589111e3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php index 10e187a17d0..49b4de89ec1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Edit/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php index f39be34a44d..3c66fdea52f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Edit/Assigned.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php index f156b75bc0f..b5d4bf3b8de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php index 7913a729b1f..d04e0ff39d0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/All.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php index c90217681e3..564f61c133a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Customers.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php index 8dbadb33695..f3707ad04ed 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php index d0ab89a821f..2ddfac16183 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,9 +30,6 @@ */ class Mage_Adminhtml_Block_Tag_Grid_Pending extends Mage_Adminhtml_Block_Widget_Grid { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php index 6f9eecf99fe..dc69732336a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Tag_Grid_Products extends Mage_Adminhtml_Block_Widget_Grid { - protected function _prepareCollection() { $collection = Mage::getResourceModel('tag/product_collection') @@ -82,6 +82,5 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php index 6574f8395a1..0e2f63be7cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,6 @@ */ class Mage_Adminhtml_Block_Tag_Pending extends Mage_Adminhtml_Block_Template { - /** - * Constructor - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php index 0802a69bee6..0ecce417f1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +27,6 @@ */ class Mage_Adminhtml_Block_Tag_Product extends Mage_Adminhtml_Block_Widget_Grid_Container { - public function __construct() { parent::__construct(); @@ -56,5 +55,4 @@ public function __construct() $this->_headerText = Mage::helper('tag')->__("Products Tagged with '%s'", $this->escapeHtml($tagInfo->getName())); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php index c0fc9ae1392..393da4ffc1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..c5d992243ab 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..acab22c371c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Tag/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php index bfecdee8ddb..1cbd9509246 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,7 +67,7 @@ public function __construct() /** * Add to layout accordion block * - * @return Mage_Adminhtml_Block_Tag_Edit + * @return $this */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php index 92a0acea0c0..57aedbb688f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php index 2af52771175..0ad46df7693 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php index 644f953d8b1..7c8f964aa7a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php index 346d3e9cc0f..9e7a5d2714a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php index ae49619d698..c0cd02b3b2c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php index 0187fd88828..e9943fcb854 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php index 5bc43dcb054..4b384712517 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php index 59ca2c1292e..2c2b23b1e30 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php index f4140f554c4..8856d0cfda2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php index 5cd42bb910e..30406975975 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php index c6ed56dbf44..ee30df0f02a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php index 4dd29bb0124..3960c41d5e0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tax/Rate/Title/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php index 0689f6022b6..23f30e049e6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php index 0a8b5ad9ee8..f84bf9bf07f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php index 4fa945701dc..66fcec1b4cc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php index a6d6923efe7..614081ab43e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Tax_Rule extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php index 6353c35f019..5122a3fce04 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php index d554d94c33e..a4fd3efcd54 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php index 86eb21fe25d..c77b5f2eb46 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Template.php b/app/code/core/Mage/Adminhtml/Block/Template.php index d71f3fa1e3d..b93cd9180c1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Template.php +++ b/app/code/core/Mage/Adminhtml/Block/Template.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,7 +53,7 @@ public function getFormKey() * the feature "Disable module output" doesn't cover Admin area * * @param string $moduleName Full module name - * @return boolean + * @return bool */ public function isOutputEnabled($moduleName = null) { diff --git a/app/code/core/Mage/Adminhtml/Block/Text/List.php b/app/code/core/Mage/Adminhtml/Block/Text/List.php index ce272d1b2a9..eb75182129c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Text/List.php +++ b/app/code/core/Mage/Adminhtml/Block/Text/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Text_List extends Mage_Core_Block_Text_List { - /** * @return string */ @@ -35,5 +35,4 @@ protected function _getUrlModelClass() { return 'adminhtml/url'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php index 0a45ab1866e..f2fe578f06d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..1674a73fe24 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,7 +50,7 @@ public function __construct() * @param int $parentId * @param bool $asJson * @param int $recursionLevel - * @return array + * @return array|string */ public function getTreeArray($parentId = null, $asJson = false, $recursionLevel = 3) { diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php index d25996f7565..7971f971e85 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,10 +43,7 @@ class Mage_Adminhtml_Block_Urlrewrite_Edit extends Mage_Adminhtml_Block_Widget_C protected $_buttonsHtml; /** - * Prepare page layout, basing on different registry and request variables - * - * Generates layout of: creation modes selector, products grid, categories tree, urlrewrite edit form - * @return $this + * @inheritDoc */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php index d9812caf76b..dc23587a7c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php index 527ae958057..ef95eb17a0c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Link.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php index 0343c6c8816..62880443085 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php index c8f664d0b79..acaabc8b952 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Selector.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php index ea903aff5a9..ee8df80a45f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -62,7 +63,7 @@ public function getModes() /** * Label getter * - * @return array + * @return string */ public function getSelectorLabel() { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget.php b/app/code/core/Mage/Adminhtml/Block/Widget.php index 2ea12319960..5165f960b7a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Accordion.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php index b5b2c21fe70..07eb878cbcb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Accordion/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php index 4fb976b8049..b57f70fd8e7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Breadcrumbs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php index 94872f661a2..f5586ef4527 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php index 5e78e8049e9..366598c83f7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php index 2a2f83311a4..f64aeddd07c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,8 +59,8 @@ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Templat * * @param string $id * @param array $data - * @param integer $level - * @param integer $sortOrder + * @param int $level + * @param int $sortOrder * @param string|null $area area, that button should be displayed in ('header', 'footer', null) * @return $this */ @@ -83,8 +84,8 @@ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'h * * @param string $id * @param array $data - * @param integer $level - * @param integer $sortOrder + * @param int $level + * @param int $sortOrder * @param string|null $area area, that button should be displayed in ('header', 'footer', null) * @return $this */ @@ -276,7 +277,7 @@ public function getHeaderHtml() /** * Check if there's anything to display in footer * - * @return boolean + * @return bool */ public function hasFooterButtons() { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php index 922857c9ef1..9e4870e3096 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php index 78cc0eefc0b..f17752dc9bd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php index bbaecdd0941..d1fd72aeaf6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php index 0389c13724e..a747ddc9806 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php index b6b7da97aee..958d5f5c6ba 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php index 4c223615bf7..0e7db1fb2cf 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php index 60af759dd2c..c93bb18a61d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php index 99dd2f9f350..be6dfbff9ac 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 73d6ab6e4b1..56cbb6a3fd1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,9 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method $this setSortable(bool $value) + * @method $this setUseAjax(bool $value) */ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget { @@ -83,7 +87,7 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget */ protected $_emptyText; - /** + /** * Empty grid text CSS class * * @var string|null @@ -93,28 +97,28 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget /** * Pager visibility * - * @var boolean + * @var bool */ protected $_pagerVisibility = true; /** * Column headers visibility * - * @var boolean + * @var bool */ protected $_headersVisibility = true; /** * Filter visibility * - * @var boolean + * @var bool */ protected $_filterVisibility = true; /** * Massage block visibility * - * @var boolean + * @var bool */ protected $_messageBlockVisibility = false; @@ -123,14 +127,14 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget /** * Count totals * - * @var boolean + * @var bool */ protected $_countTotals = false; /** * Count subtotals * - * @var boolean + * @var bool */ protected $_countSubTotals = false; @@ -211,6 +215,18 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget */ protected $_emptyCellLabel = ''; + /** + * @var array[][] + */ + protected $defaultColumnSettings = [ + 'date' => [ + 'width' => 140 + ], + 'datetime' => [ + 'width' => 160 + ], + ]; + /** * Mage_Adminhtml_Block_Widget_Grid constructor. * @param array $attributes @@ -325,6 +341,9 @@ public function getCollection() public function addColumn($columnId, $column) { if (is_array($column)) { + if (isset($column['type'], $this->defaultColumnSettings[$column['type']])) { + $column += $this->defaultColumnSettings[$column['type']]; + } $this->_columns[$columnId] = $this->getLayout()->createBlock('adminhtml/widget_grid_column') ->setData($column) ->setGrid($this); @@ -431,7 +450,7 @@ public function getLastColumnId() } /** - * @return int|void + * @return int */ public function getColumnCount() { @@ -811,7 +830,7 @@ public function setVarNameFilter($name) /** * Set visibility of column headers * - * @param boolean $visible + * @param bool $visible */ public function setHeadersVisibility($visible = true) { @@ -821,7 +840,7 @@ public function setHeadersVisibility($visible = true) /** * Return visibility of column headers * - * @return boolean + * @return bool */ public function getHeadersVisibility() { @@ -831,7 +850,7 @@ public function getHeadersVisibility() /** * Set visibility of pager * - * @param boolean $visible + * @param bool $visible */ public function setPagerVisibility($visible = true) { @@ -841,7 +860,7 @@ public function setPagerVisibility($visible = true) /** * Return visibility of pager * - * @return boolean + * @return bool */ public function getPagerVisibility() { @@ -851,7 +870,7 @@ public function getPagerVisibility() /** * Set visibility of filter * - * @param boolean $visible + * @param bool $visible */ public function setFilterVisibility($visible = true) { @@ -861,7 +880,7 @@ public function setFilterVisibility($visible = true) /** * Return visibility of filter * - * @return boolean + * @return bool */ public function getFilterVisibility() { @@ -871,7 +890,7 @@ public function getFilterVisibility() /** * Set visibility of filter * - * @param boolean $visible + * @param bool $visible */ public function setMessageBlockVisibility($visible = true) { @@ -881,7 +900,7 @@ public function setMessageBlockVisibility($visible = true) /** * Return visibility of filter * - * @return boolean + * @return bool */ public function getMessageBlockVisibility() { @@ -1286,7 +1305,7 @@ protected function _exportExcelItem(Varien_Object $item, Varien_Io_File $adapter * Return array with keys type and value * * @param string $sheetName - * @return string + * @return array * @throws Exception */ public function getExcelFile($sheetName = '') @@ -1617,7 +1636,7 @@ public function getEmptyTextClass() /** * Set count totals * - * @param boolean $count + * @param bool $count */ public function setCountTotals($count = true) { @@ -1627,7 +1646,7 @@ public function setCountTotals($count = true) /** * Return count totals * - * @return boolean + * @return bool */ public function getCountTotals() { @@ -1657,7 +1676,7 @@ public function getTotals() /** * Set subtotals * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setCountSubTotals($flag = true) @@ -1669,7 +1688,7 @@ public function setCountSubTotals($flag = true) /** * Return count subtotals * - * @return boolean + * @return bool */ public function getCountSubTotals() { @@ -1720,7 +1739,7 @@ public function getSubTotals() * Check whether subtotal should be rendered * * @param Varien_Object $item - * @return boolean + * @return bool */ public function shouldRenderSubTotal($item) { @@ -1742,7 +1761,7 @@ public function getSubTotalColumns() * * @param Varien_Object $item * @param Mage_Adminhtml_Block_Widget_Grid_Column $column - * @return integer|boolean + * @return int|bool */ public function getRowspan($item, $column) { @@ -1755,7 +1774,7 @@ public function getRowspan($item, $column) /** * @param string|object $column * @param string $value - * @return boolean|Mage_Adminhtml_Block_Widget_Grid + * @return bool|Mage_Adminhtml_Block_Widget_Grid */ public function isColumnGrouped($column, $value = null) { @@ -1799,7 +1818,7 @@ public function getMultipleRowColumns() * * @param Varien_Object $item * @param Mage_Adminhtml_Block_Widget_Grid_Column $column - * @return boolean + * @return bool */ public function shouldRenderCell($item, $column) { @@ -1817,7 +1836,7 @@ public function shouldRenderCell($item, $column) * * @param Varien_Object $item * @param Mage_Adminhtml_Block_Widget_Grid_Column $column - * @return boolean + * @return bool */ public function shouldRenderEmptyCell($item, $column) { @@ -1827,7 +1846,7 @@ public function shouldRenderEmptyCell($item, $column) /** * Retrieve colspan for empty cell * - * @return integer + * @return int */ public function getEmptyCellColspan() { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php index c8c6301baf1..f0786ff87ca 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php index 125aa267cd3..4d170c0c8a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,15 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method array getActions() + * @method $this setActions(array $value) + * @method array getFilterConditionCallback() + * @method string getDir() + * @method string getFilterIndex() + * @method $this setFormat(string $value) + * @method string getIndex() + * @method bool getNoLink() */ class Mage_Adminhtml_Block_Widget_Grid_Column extends Mage_Adminhtml_Block_Widget { @@ -46,21 +56,33 @@ public function getGrid() return $this->_grid; } + /** + * @return bool + */ public function isLast() { return $this->getId() == $this->getGrid()->getLastColumnId(); } + /** + * @return string + */ public function getHtmlProperty() { return $this->getRenderer()->renderProperty(); } + /** + * @return string + */ public function getHeaderHtml() { return $this->getRenderer()->renderHeader(); } + /** + * @return string|null + */ public function getCssClass() { if (is_null($this->_cssClass)) { @@ -74,16 +96,26 @@ public function getCssClass() if ($this->getEditable()) { $this->_cssClass .= ' editable'; } + // Add css class for sorted columns + if ($this->hasData('dir')) { + $this->_cssClass .= ' sorted'; + } } return $this->_cssClass; } + /** + * @return string|null + */ public function getCssProperty() { return $this->getRenderer()->renderCss(); } + /** + * @return string|null + */ public function getHeaderCssClass() { $class = $this->getData('header_css_class'); @@ -93,9 +125,15 @@ public function getHeaderCssClass() if ($this->isLast()) { $class .= ' last'; } + if ($this->hasData('dir')) { + $class .= ' sorted'; + } return $class; } + /** + * @return string + */ public function getHeaderHtmlProperty() { $str = ''; @@ -365,14 +403,16 @@ public function getFilter() return $this->_filter; } + /** + * @return string + */ public function getFilterHtml() { if ($this->getFilter()) { return $this->getFilter()->getHtml(); - } else { - return ' '; } - return null; + + return ' '; } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php index d9a1efae2cf..d5c3fbbf1d7 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php index 99dd41187f9..2353305a81e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,11 +28,17 @@ */ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select { + /** + * @return string + */ public function getHtml() { return '' . parent::getHtml() . ''; } + /** + * @return array[] + */ protected function _getOptions() { return [ @@ -50,17 +57,18 @@ protected function _getOptions() ]; } + /** + * @return array|null + */ public function getCondition() { if ($this->getValue()) { return $this->getColumn()->getValue(); - } - else { + } else { return [ ['neq'=>$this->getColumn()->getValue()], ['is'=>new Zend_Db_Expr('NULL')] ]; } - //return array('like'=>'%'.$this->getValue().'%'); } } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php index 61b1bab66e1..a5c40fa9600 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php index f667e64a49e..f7386dd81a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php index 4e7cd0b122a..c5476c45412 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php index 9e8caf18f08..22a2425a24d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php index cb3ca5c48e5..d32c2298a7f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php index a1e0a24f77b..dab1f55e3ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php index fcbfbe16a6c..ad335b6aaf9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Range.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php index e67aa3337e5..2f6e380b1de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,5 +57,4 @@ public function getCondition() return $value; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php index b7732f2d6a0..bcf3767ba61 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,9 @@ */ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract { + /** + * @return array[] + */ protected function _getOptions() { $emptyOption = ['value' => null, 'label' => '']; @@ -38,7 +42,7 @@ protected function _getOptions() } $colOptions = $this->getColumn()->getOptions(); - if (!empty($colOptions) && is_array($colOptions) ) { + if (!empty($colOptions) && is_array($colOptions)) { $options = [$emptyOption]; foreach ($colOptions as $value => $label) { $options[] = ['value' => $value, 'label' => $label]; @@ -57,15 +61,18 @@ protected function _getOptions() */ protected function _renderOption($option, $value) { - $selected = (($option['value'] == $value && (!is_null($value))) ? ' selected="selected"' : '' ); + $selected = (($option['value'] == $value && (!is_null($value))) ? ' selected="selected"' : ''); return ''; } + /** + * @return string + */ public function getHtml() { $html = '' . ''; $i = 0; - foreach ($actions as $action){ + foreach ($actions as $action) { $i++; - if ( is_array($action) ) { + if (is_array($action)) { $out .= $this->_toOptionHtml($action, $row); } } @@ -95,7 +95,7 @@ protected function _toLinkHtml($action, Varien_Object $row) $actionCaption = ''; $this->_transformActionData($action, $actionCaption, $row); - if(isset($action['confirm'])) { + if (isset($action['confirm'])) { $action['onclick'] = 'return window.confirm(\'' . addslashes($this->escapeHtml($action['confirm'])) . '\')'; @@ -116,8 +116,8 @@ protected function _toLinkHtml($action, Varien_Object $row) */ protected function _transformActionData(&$action, &$actionCaption, Varien_Object $row) { - foreach ( $action as $attribute => $value ) { - if(isset($action[$attribute]) && !is_array($action[$attribute])) { + foreach ($action as $attribute => $value) { + if (isset($action[$attribute]) && !is_array($action[$attribute])) { $this->getColumn()->setFormat($action[$attribute]); $action[$attribute] = parent::render($row); } else { @@ -128,12 +128,12 @@ protected function _transformActionData(&$action, &$actionCaption, Varien_Object case 'caption': $actionCaption = $action['caption']; unset($action['caption']); - break; + break; case 'url': - if(is_array($action['url'])) { + if (is_array($action['url'])) { $params = [$action['field']=>$this->_getValue($row)]; - if(isset($action['url']['params'])) { + if (isset($action['url']['params'])) { $params = array_merge($action['url']['params'], $params); } $action['href'] = $this->getUrl($action['url']['base'], $params); @@ -142,13 +142,12 @@ protected function _transformActionData(&$action, &$actionCaption, Varien_Object $action['href'] = $action['url']; } unset($action['url']); - break; + break; case 'popup': $action['onclick'] = 'popWin(this.href,\'_blank\',\'width=800,height=700,resizable=1,scrollbars=1\');return false;'; break; - } } return $this; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php index f9633af1b0d..7b2e7d3d12b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Concat.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php index 4d460309188..cc052133790 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Concat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php index cb9fb5459a0..1dc5b898f44 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,14 +25,13 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country - extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract +class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { /** * Render country grid column * * @param Varien_Object $row - * @return string + * @return string|null */ public function render(Varien_Object $row) { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php index 151bdae9d97..7957074f154 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php index bb17b8ad37f..b3ceb6a73ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Date.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php index e5204ee8a1e..0988ea214a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Datetime.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Input.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php index 7c1588ae288..2a7eda6eed2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Input.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php index 4d7c9761590..d11f22e12de 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - interface Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Interface { /** diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php index 650eab77355..77f6e1d4529 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Ip.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Longtext.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php index 00204f71360..11866fe4fb3 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Longtext.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php index ddb08de32ea..fe9ddcf6977 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -80,5 +81,4 @@ protected function _getCheckboxHtml($value, $checked) $html .= 'value="' . $this->escapeHtml($value) . '" class="massaction-checkbox"' . $checked . '/>'; return $html; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php index 7ddfb41e859..bd4781dd349 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -59,5 +59,4 @@ public function renderCss() { return parent::renderCss() . ' a-right'; } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php index 19d5a305253..d36ff93960f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -57,5 +58,6 @@ public function render(Varien_Object $row) return $this->escapeHtml($value); } } + return ''; } } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php index b0ef412780d..f569421c728 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Radio.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php index 6dc47235d53..14a9e54cfaa 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Radio.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php index 5851a0de5e0..3f8f17c594f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Select.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,11 +25,9 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Select extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract { - /** * Renders grid column * @@ -49,5 +47,4 @@ public function render(Varien_Object $row) $html.=''; return $html; } - } 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..1f953a5218e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..53cb4fedc93 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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..eaca7f0d0ff 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..9cfa927a4f5 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,7 +32,7 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Wrapline /** * Default max length of a line at one row * - * @var integer + * @var int */ protected $_defaultMaxLineLength = 60; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php index ed127c5daee..23bb777915a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,6 +32,14 @@ class Mage_Adminhtml_Block_Widget_Grid_Container extends Mage_Adminhtml_Block_Wi protected $_backButtonLabel; protected $_blockGroup = 'adminhtml'; + /** + * @var string + */ + protected $_block; + + /** + * Mage_Adminhtml_Block_Widget_Grid_Container constructor. + */ public function __construct() { if (is_null($this->_addButtonLabel)) { @@ -51,6 +60,9 @@ public function __construct() ]); } + /** + * @inheritdoc + */ protected function _prepareLayout() { $this->setChild( 'grid', @@ -59,21 +71,33 @@ protected function _prepareLayout() return parent::_prepareLayout(); } + /** + * @return string + */ public function getCreateUrl() { return $this->getUrl('*/*/new'); } + /** + * @return string + */ public function getGridHtml() { return $this->getChildHtml('grid'); } + /** + * @return string + */ protected function getAddButtonLabel() { return $this->_addButtonLabel; } + /** + * @return string + */ protected function getBackButtonLabel() { return $this->_backButtonLabel; @@ -88,11 +112,17 @@ protected function _addBackButton() ]); } + /** + * @return string + */ public function getHeaderCssClass() { return 'icon-head ' . parent::getHeaderCssClass(); } + /** + * @return string + */ public function getHeaderWidth() { return 'width:50%;'; diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php index da92db591e3..a7c18fe2cce 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +28,4 @@ */ class Mage_Adminhtml_Block_Widget_Grid_Massaction extends Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract { - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php index ab342e503aa..8e5698569bb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php @@ -7,25 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Grid widget massaction block * - * @method Mage_Sales_Model_Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors - * @method boolean getHideFormElement() * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method $this setFormFieldName(string $value) + * @method $this setHideFormElement(bool $value) Hide Form element to prevent IE errors + * @method bool getHideFormElement() */ abstract class Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract extends Mage_Adminhtml_Block_Widget { @@ -84,11 +87,7 @@ public function addItem($itemId, array $item) */ public function getItem($itemId) { - if(isset($this->_items[$itemId])) { - return $this->_items[$itemId]; - } - - return null; + return $this->_items[$itemId] ?? null; } /** @@ -119,7 +118,7 @@ public function getItemsJson() /** * Retrieve massaction items count * - * @return integer + * @return int */ public function getCount() { @@ -129,7 +128,7 @@ public function getCount() /** * Checks are massactions available * - * @return boolean + * @return bool */ public function isAvailable() { @@ -265,7 +264,7 @@ public function removeItem($itemId) /** * Retrieve select all functionality flag check * - * @return boolean + * @return bool */ public function getUseSelectAll() { @@ -275,7 +274,7 @@ public function getUseSelectAll() /** * Retrieve select all functionality flag check * - * @param boolean $flag + * @param bool $flag * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract */ public function setUseSelectAll($flag) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php index f5d6759dcd9..a93b3ba1964 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Block_Widget_Grid_Massaction_Item extends Mage_Adminhtml_Block_Widget { - protected $_massaction = null; /** @@ -104,5 +104,4 @@ public function getAdditionalActionBlockHtml() { return $this->getChildHtml('additional_action'); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php index 88abf8d4133..624c5be9c72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Massaction/Item/Additional/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php index d026f9cb7ea..6ffa4450d8e 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item/Additional/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php index 16340959250..36c400c0502 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -55,8 +56,7 @@ public function addColumnInputName($names) foreach ($names as $name) { $this->addColumnInputName($name); } - } - else { + } else { if (!in_array($names, $this->_inputsToSerialize)) { $this->_inputsToSerialize[] = $names; } @@ -67,7 +67,7 @@ public function addColumnInputName($names) * Get grid column input names to serialize * * @param bool $asJSON - * @return array + * @return array|string */ public function getColumnInputNames($asJSON = false) { @@ -87,8 +87,7 @@ public function getDataAsJSON() $result = []; if ($serializeData = $this->getSerializeData()) { $result = $serializeData; - } - elseif (!empty($this->_inputsToSerialize)) { + } elseif (!empty($this->_inputsToSerialize)) { return '{}'; } return Mage::helper('core')->jsonEncode($result); diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php index b92454741df..a822adb08a0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tab/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,14 +45,14 @@ public function getTabTitle(); /** * Can show tab in tabs * - * @return boolean + * @return bool */ public function canShowTab(); /** * Tab is hidden * - * @return boolean + * @return bool */ public function isHidden(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php index a5fd32deb04..0f9bed83818 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +27,6 @@ class Mage_Adminhtml_Block_Widget_Tabs extends Mage_Adminhtml_Block_Widget { /** - * tabs structure - * * @var array */ protected $_tabs = []; @@ -96,7 +93,6 @@ public function setDestElementId($elementId) * @param string $tabId new tab Id * @param string|array|Varien_Object $tab * @param string $afterTabId - * @return Mage_Adminhtml_Block_Widget_Tabs */ public function addTabAfter($tabId, $tab, $afterTabId) { diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php index d6a0b4a01a8..a95a5832a00 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tree.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Block/Widget/View/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php index 28f15fe2122..e175eaf16db 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/View/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index b835f35fc48..beef988cbb7 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php b/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php index 0bde95a32f8..2a4b0e6aa25 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Controller/Report/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php b/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php index 5587a8c50b7..e1841e2d92e 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Adminhtml_Controller_Rss_Abstract extends Mage_Adminhtml_Controller_A * Check feed enabled in config * * @param string $code - * @return boolean + * @return bool */ protected function isFeedEnable($code) { @@ -43,7 +44,7 @@ protected function isFeedEnable($code) * Do check feed enabled and prepare response * * @param string $code - * @return boolean + * @return bool */ protected function checkFeedEnable($code) { diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php index 77727f4e257..9af516b16cd 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +46,7 @@ protected function _construct() /** * Init layout, menu and breadcrumb * - * @return Mage_Adminhtml_Sales_CreditmemoController + * @return $this */ protected function _initAction() { diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php index c932de23a9d..c5132088ad0 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Invoice.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoice extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php index 77a9b0dba43..14c51325c09 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php +++ b/app/code/core/Mage/Adminhtml/Controller/Sales/Shipment.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Exception.php b/app/code/core/Mage/Adminhtml/Exception.php index 53c7f56f425..f51b88378c5 100644 --- a/app/code/core/Mage/Adminhtml/Exception.php +++ b/app/code/core/Mage/Adminhtml/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Helper/Addresses.php b/app/code/core/Mage/Adminhtml/Helper/Addresses.php index e423ec3ad65..03c58bd8b7d 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Addresses.php +++ b/app/code/core/Mage/Adminhtml/Helper/Addresses.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +29,8 @@ class Mage_Adminhtml_Helper_Addresses extends Mage_Core_Helper_Abstract { const DEFAULT_STREET_LINES_COUNT = 2; + protected $_moduleName = 'Mage_Adminhtml'; + /** * Check if number of street lines is non-zero * @@ -37,7 +39,7 @@ class Mage_Adminhtml_Helper_Addresses extends Mage_Core_Helper_Abstract */ public function processStreetAttribute(Mage_Customer_Model_Attribute $attribute) { - if($attribute->getScopeMultilineCount() <= 0) { + if ($attribute->getScopeMultilineCount() <= 0) { $attribute->setScopeMultilineCount(self::DEFAULT_STREET_LINES_COUNT); } return $attribute; diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog.php b/app/code/core/Mage/Adminhtml/Helper/Catalog.php index c2c83835cf5..c98dad0ad7e 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Adminhtml_Helper_Catalog extends Mage_Core_Helper_Abstract { const XML_PATH_SITEMAP_VALID_PATHS = 'general/file/sitemap_generate_valid_paths'; + protected $_moduleName = 'Mage_Adminhtml'; + /** * Attribute Tab block name for product edit * diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php index 4fbbcf7dee1..4ce1cc850bf 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +28,9 @@ */ class Mage_Adminhtml_Helper_Catalog_Product_Composite extends Mage_Core_Helper_Abstract { - /** + protected $_moduleName = 'Mage_Adminhtml'; + + /** * Init layout of product configuration update result * * @param Mage_Adminhtml_Controller_Action $controller @@ -55,6 +58,7 @@ public function renderUpdateResult($controller, Varien_Object $updateResult) $this->_initUpdateResultLayout($controller); $controller->renderLayout(); + return $this; } /** @@ -142,5 +146,6 @@ public function renderConfigureResult($controller, Varien_Object $configureResul $this->_initConfigureResultLayout($controller, $isOk, $productType); $controller->renderLayout(); + return $this; } } diff --git a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php index 12f9bb81246..c6c60da9df5 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php +++ b/app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +92,7 @@ public function getProductIds() /** * Return selected store id from request * - * @return integer + * @return int */ public function getSelectedStoreId() { diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php index 38c9ea65045..3ab6578a0df 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,14 +33,14 @@ abstract class Mage_Adminhtml_Helper_Dashboard_Abstract extends Mage_Core_Helper * * @var Mage_Core_Model_Resource_Db_Collection_Abstract|Mage_Eav_Model_Entity_Collection_Abstract|array */ - protected $_collection; + protected $_collection; /** * Parameters for helper * * @var array */ - protected $_params = []; + protected $_params = []; public function getCollection() { @@ -49,7 +50,7 @@ public function getCollection() return $this->_collection; } - abstract protected function _initCollection(); + abstract protected function _initCollection(); /** * Returns collection items @@ -71,7 +72,7 @@ public function getColumn($index) $result = []; foreach ($this->getItems() as $item) { if (is_array($item)) { - if(isset($item[$index])) { + if (isset($item[$index])) { $result[] = $item[$index]; } else { $result[] = null; @@ -97,15 +98,11 @@ public function setParams(array $params) public function getParam($name) { - if(isset($this->_params[$name])) { - return $this->_params[$name]; - } - - return null; + return $this->_params[$name] ?? null; } public function getParams() { return $this->_params; } - } +} diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php index ccdd9f3bb1f..d1f9ed39d2b 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Adminhtml_Helper_Dashboard_Data extends Mage_Core_Helper_Data { + protected $_moduleName = 'Mage_Adminhtml'; + protected $_locale = null; protected $_stores = null; @@ -37,7 +40,7 @@ class Mage_Adminhtml_Helper_Dashboard_Data extends Mage_Core_Helper_Data */ public function getStores() { - if(!$this->_stores) { + if (!$this->_stores) { $this->_stores = Mage::app()->getStore()->getResourceCollection()->load(); } diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php index e91495ee935..4333b320aa4 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php +++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Order.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,7 @@ */ class Mage_Adminhtml_Helper_Dashboard_Order extends Mage_Adminhtml_Helper_Dashboard_Abstract { + protected $_moduleName = 'Mage_Adminhtml'; protected function _initCollection() { @@ -37,19 +39,19 @@ protected function _initCollection() if ($this->getParam('store')) { $this->_collection->addFieldToFilter('store_id', $this->getParam('store')); - } else if ($this->getParam('website')){ + } elseif ($this->getParam('website')) { $storeIds = Mage::app()->getWebsite($this->getParam('website'))->getStoreIds(); $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]); - } else if ($this->getParam('group')){ + } elseif ($this->getParam('group')) { $storeIds = Mage::app()->getGroup($this->getParam('group'))->getStoreIds(); $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]); } elseif (!$this->_collection->isLive()) { - $this->_collection->addFieldToFilter('store_id', + $this->_collection->addFieldToFilter( + 'store_id', ['eq' => Mage::app()->getStore(Mage_Core_Model_Store::ADMIN_CODE)->getId()] ); } $this->_collection->load(); } - } diff --git a/app/code/core/Mage/Adminhtml/Helper/Data.php b/app/code/core/Mage/Adminhtml/Helper/Data.php index f5996333cd2..aeb0f2870ca 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Data.php +++ b/app/code/core/Mage/Adminhtml/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,6 +34,8 @@ class Mage_Adminhtml_Helper_Data extends Mage_Adminhtml_Helper_Help_Mapping const XML_PATH_CUSTOM_ADMIN_PATH = 'default/admin/url/custom_path'; const XML_PATH_ADMINHTML_SECURITY_USE_FORM_KEY = 'admin/security/use_form_key'; + protected $_moduleName = 'Mage_Adminhtml'; + /** @deprecated */ protected $_pageHelpUrl; diff --git a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php index ff691eac061..c51df3738eb 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php +++ b/app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,10 +24,12 @@ * * @category Mage * @package Mage_Adminhtml + * @author Magento Core Team */ - abstract class Mage_Adminhtml_Helper_Help_Mapping extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Adminhtml'; + /** * Mapping of help page urls depending on module and page route * @@ -218,7 +221,7 @@ abstract class Mage_Adminhtml_Helper_Help_Mapping extends Mage_Core_Helper_Abstr */ protected function findInMapping($frontModule, $controllerName, $actionName) { - if ($actionName === 'index' ) { + if ($actionName === 'index') { $targetToFind = $controllerName; } else { $targetToFind = $controllerName . '/' . $actionName; @@ -241,5 +244,4 @@ protected function getHelpTargetVersion() { return Mage::getConfig()->getNode('default/help/target_version'); } - } diff --git a/app/code/core/Mage/Adminhtml/Helper/Js.php b/app/code/core/Mage/Adminhtml/Helper/Js.php index 3a9fb09d28c..725e2d9ba00 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Js.php +++ b/app/code/core/Mage/Adminhtml/Helper/Js.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,8 @@ */ class Mage_Adminhtml_Helper_Js extends Mage_Core_Helper_Js { + protected $_moduleName = 'Mage_Adminhtml'; + /** * Decode serialized grid data * @@ -50,7 +53,7 @@ public function decodeGridSerializedInput($encoded) $isSimplified = (strpos($encoded, '=') === false); $result = []; parse_str($encoded, $decoded); - foreach($decoded as $key => $value) { + foreach ($decoded as $key => $value) { if (is_numeric($key)) { if ($isSimplified) { $result[] = $key; diff --git a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php index b59e2a36d84..b0638578444 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Media/Js.php +++ b/app/code/core/Mage/Adminhtml/Helper/Media/Js.php @@ -7,43 +7,45 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Media library js helper * - * @deprecated since 1.7.0.0 * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * @deprecated since 1.7.0.0 */ class Mage_Adminhtml_Helper_Media_Js extends Mage_Core_Helper_Js { + protected $_moduleName = 'Mage_Adminhtml'; public function __construct() { - $this->_translateData = [ - 'Complete' => $this->__('Complete'), - 'File size should be more than 0 bytes' => $this->__('File size should be more than 0 bytes'), - 'Upload Security Error' => $this->__('Upload Security Error'), - 'Upload HTTP Error' => $this->__('Upload HTTP Error'), - 'Upload I/O Error' => $this->__('Upload I/O Error'), - 'SSL Error: Invalid or self-signed certificate' => $this->__('SSL Error: Invalid or self-signed certificate'), - 'Tb' => $this->__('Tb'), - 'Gb' => $this->__('Gb'), - 'Mb' => $this->__('Mb'), - 'Kb' => $this->__('Kb'), - 'b' => $this->__('b') - ]; + $this->_translateData = [ + 'Complete' => $this->__('Complete'), + 'File size should be more than 0 bytes' => $this->__('File size should be more than 0 bytes'), + 'Upload Security Error' => $this->__('Upload Security Error'), + 'Upload HTTP Error' => $this->__('Upload HTTP Error'), + 'Upload I/O Error' => $this->__('Upload I/O Error'), + 'SSL Error: Invalid or self-signed certificate' => $this->__('SSL Error: Invalid or self-signed certificate'), + 'Tb' => $this->__('Tb'), + 'Gb' => $this->__('Gb'), + 'Mb' => $this->__('Mb'), + 'Kb' => $this->__('Kb'), + 'b' => $this->__('b') + ]; } /** @@ -60,5 +62,4 @@ public function getTranslatorScript() . '}'; return $this->getScript($script); } - } diff --git a/app/code/core/Mage/Adminhtml/Helper/Rss.php b/app/code/core/Mage/Adminhtml/Helper/Rss.php index db8836dc473..0633d6c8a45 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Rss.php +++ b/app/code/core/Mage/Adminhtml/Helper/Rss.php @@ -7,24 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default rss helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Helper_Rss extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Adminhtml'; + public function authAdmin($path) { $session = Mage::getSingleton('rss/session'); @@ -35,7 +39,7 @@ public function authAdmin($path) $adminSession = Mage::getModel('admin/session'); $user = $adminSession->login($username, $password); //$user = Mage::getModel('admin/user')->login($username, $password); - if($user && $user->getId() && $user->getIsActive() == '1' && $adminSession->isAllowed($path)){ + if ($user && $user->getId() && $user->getIsActive() == '1' && $adminSession->isAllowed($path)) { $session->setAdmin($user); } else { Mage::helper('core/http')->authFailed(); diff --git a/app/code/core/Mage/Adminhtml/Helper/Sales.php b/app/code/core/Mage/Adminhtml/Helper/Sales.php index 01a39922b7d..7d444c753b2 100644 --- a/app/code/core/Mage/Adminhtml/Helper/Sales.php +++ b/app/code/core/Mage/Adminhtml/Helper/Sales.php @@ -7,19 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Helper_Sales extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Adminhtml'; + /** * Display price attribute value in base order currency and in place order currency * @@ -88,12 +96,12 @@ public function applySalableProductTypesFilter($collection) { $productTypes = Mage::getConfig()->getNode('adminhtml/sales/order/create/available_product_types')->asArray(); $productTypes = array_keys($productTypes); - foreach($collection->getItems() as $key => $item) { + foreach ($collection->getItems() as $key => $item) { if ($item instanceof Mage_Catalog_Model_Product) { $type = $item->getTypeId(); - } else if ($item instanceof Mage_Sales_Model_Order_Item) { + } elseif ($item instanceof Mage_Sales_Model_Order_Item) { $type = $item->getProductType(); - } else if ($item instanceof Mage_Sales_Model_Quote_Item) { + } elseif ($item instanceof Mage_Sales_Model_Quote_Item) { $type = $item->getProductType(); } else { $type = ''; diff --git a/app/code/core/Mage/Adminhtml/Model/Config.php b/app/code/core/Mage/Adminhtml/Model/Config.php index 75dbea1a654..961b1a33b95 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config.php +++ b/app/code/core/Mage/Adminhtml/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -146,7 +147,7 @@ protected function _initSectionsAndTabs() */ public function getSection($sectionCode=null, $websiteCode=null, $storeCode=null) { - if ($sectionCode){ + if ($sectionCode) { return $this->getSections()->$sectionCode; } elseif ($websiteCode) { return $this->getSections()->$websiteCode; @@ -159,10 +160,10 @@ public function getSection($sectionCode=null, $websiteCode=null, $storeCode=null * @param Varien_Simplexml_Element $node * @param string $websiteCode * @param string $storeCode - * @param boolean $isField - * @return boolean + * @param bool $isField + * @return bool */ - public function hasChildren ($node, $websiteCode=null, $storeCode=null, $isField=false) + public function hasChildren($node, $websiteCode=null, $storeCode=null, $isField=false) { $showTab = false; if ($storeCode) { @@ -178,22 +179,20 @@ public function hasChildren ($node, $websiteCode=null, $storeCode=null, $isField } } } elseif (isset($node->show_in_default)) { - if ((int)$node->show_in_default) { - $showTab=true; - } + if ((int)$node->show_in_default) { + $showTab=true; + } } if ($showTab) { if (isset($node->groups)) { - foreach ($node->groups->children() as $children){ - if ($this->hasChildren ($children, $websiteCode, $storeCode)) { + foreach ($node->groups->children() as $children) { + if ($this->hasChildren($children, $websiteCode, $storeCode)) { return true; } - } - }elseif (isset($node->fields)) { - - foreach ($node->fields->children() as $children){ - if ($this->hasChildren ($children, $websiteCode, $storeCode, true)) { + } elseif (isset($node->fields)) { + foreach ($node->fields->children() as $children) { + if ($this->hasChildren($children, $websiteCode, $storeCode, true)) { return true; } } @@ -253,8 +252,7 @@ public function getSystemConfigNodeLabel($sectionName, $groupName = null, $field if (!empty($groupName)) { $path .= '/fields/' . trim($fieldName, '/'); $fieldNode = $this->_sections->xpath($path); - } - else { + } else { Mage::throwException(Mage::helper('adminhtml')->__('The group node name must be specified with field node name.')); } } @@ -283,8 +281,7 @@ public function getEncryptedNodeEntriesPaths($explodePathToEntities = false) $field = $node->getParent()->getName(); if ($explodePathToEntities) { $paths[] = ['section' => $section, 'group' => $group, 'field' => $field]; - } - else { + } else { $paths[] = $section . '/' . $group . '/' . $field; } } diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php index 85cca4c4a73..618a4f01d19 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php +++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,21 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method array getGroups() + * @method $this setGroups(array $value) + * @method string getScope() + * @method $this setScope(string $value) + * @method string getScopeCode() + * @method $this setScopeCode(string $value) + * @method int getScopeId() + * @method $this setScopeId(int $value) + * @method string getSection() + * @method $this setSection(string $value) + * @method string getStore() + * @method $this setStore(string $value) + * @method string getWebsite() + * @method $this setWebsite(string $value) */ class Mage_Adminhtml_Model_Config_Data extends Varien_Object { @@ -192,12 +208,10 @@ public function save() */ if (!$inherit) { $saveTransaction->addObject($dataObject); - } - else { + } else { $deleteTransaction->addObject($dataObject); } - } - elseif (!$inherit) { + } elseif (!$inherit) { $dataObject->unsConfigId(); $saveTransaction->addObject($dataObject); } @@ -339,8 +353,7 @@ protected function _getPathConfig($path, $full = true) 'value' => $data->getValue(), 'config_id' => $data->getConfigId() ]; - } - else { + } else { $config[$data->getPath()] = $data->getValue(); } } diff --git a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php index 3c31a018c72..c0cfec04d94 100644 --- a/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php +++ b/app/code/core/Mage/Adminhtml/Model/Customer/Renderer/Region.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,7 +37,7 @@ class Mage_Adminhtml_Model_Customer_Renderer_Region implements Varien_Data_Form_ * * @var array */ - static protected $_regionCollections; + protected static $_regionCollections; public function render(Varien_Data_Form_Element_Abstract $element) { diff --git a/app/code/core/Mage/Adminhtml/Model/Email/PathValidator.php b/app/code/core/Mage/Adminhtml/Model/Email/PathValidator.php index 5df241f2675..27a47c40b83 100644 --- a/app/code/core/Mage/Adminhtml/Model/Email/PathValidator.php +++ b/app/code/core/Mage/Adminhtml/Model/Email/PathValidator.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +33,7 @@ class Mage_Adminhtml_Model_Email_PathValidator extends Zend_Validate_Abstract * If $value fails validation, then this method returns false * * @param mixed $value - * @return boolean + * @return bool */ public function isValid($value) { diff --git a/app/code/core/Mage/Adminhtml/Model/Email/Template.php b/app/code/core/Mage/Adminhtml/Model/Email/Template.php index a94cb19e4e8..36c5c239b99 100644 --- a/app/code/core/Mage/Adminhtml/Model/Email/Template.php +++ b/app/code/core/Mage/Adminhtml/Model/Email/Template.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Model_Email_Template extends Mage_Core_Model_Email_Template { /** @@ -88,7 +88,6 @@ public function getSystemConfigPathsWhereUsedCurrently() } foreach ($sysCfgNodes as $fieldNode) { - $groupNode = $fieldNode->getParent()->getParent(); $sectionNode = $groupNode->getParent()->getParent(); @@ -113,7 +112,8 @@ public function getSystemConfigPathsWhereUsedCurrently() * * @return $this */ - protected function _afterDelete() { + protected function _afterDelete() + { $paths = $this->getSystemConfigPathsWhereUsedCurrently(); foreach ($paths as $path) { $configDataCollection = Mage::getModel('core/config_data') diff --git a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php index 5bb6abc741a..bee404a3914 100644 --- a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php +++ b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +25,8 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method array getGiftmessages() */ class Mage_Adminhtml_Model_Giftmessage_Save extends Varien_Object { @@ -80,12 +83,13 @@ public function saveAllInOrder() /** * Save a single gift message * - * @param integer $entityId + * @param int $entityId * @param array $giftmessage * @return $this * @throws Throwable */ - protected function _saveOne($entityId, $giftmessage) { + protected function _saveOne($entityId, $giftmessage) + { /** @var Mage_GiftMessage_Model_Message $giftmessageModel */ $giftmessageModel = Mage::getModel('giftmessage/message'); $entityType = $this->_getMappedType($giftmessage['type']); @@ -122,7 +126,7 @@ protected function _saveOne($entityId, $giftmessage) { } elseif (!$giftmessageModel->isMessageEmpty()) { $giftmessageModel->save(); $entityModel->setGiftMessageId($giftmessageModel->getId()); - if($entityType != 'quote') { + if ($entityType != 'quote') { $entityModel->save(); } $this->_saved = true; @@ -141,7 +145,7 @@ protected function _saveOne($entityId, $giftmessage) { */ protected function _deleteOne($entityModel, $giftmessageModel=null) { - if(is_null($giftmessageModel)) { + if (is_null($giftmessageModel)) { $giftmessageModel = Mage::getModel('giftmessage/message') ->load($entityModel->getGiftMessageId()); } @@ -187,7 +191,7 @@ public function addAllowQuoteItem($item) */ public function getAllowQuoteItems() { - if(!is_array($this->_getSession()->getAllowQuoteItemsGiftMessage())) { + if (!is_array($this->_getSession()->getAllowQuoteItemsGiftMessage())) { $this->setAllowQuoteItems([]); } @@ -204,7 +208,7 @@ public function getAllowQuoteItemsProducts() $result = []; foreach ($this->getAllowQuoteItems() as $itemId) { $item = $this->_getQuote()->getItemById($itemId); - if(!$item) { + if (!$item) { continue; } $result[] = $item->getProduct()->getId(); @@ -216,11 +220,11 @@ public function getAllowQuoteItemsProducts() * Checks allowed quote item for gift messages * * @param Varien_Object $item - * @return boolean + * @return bool */ public function getIsAllowedQuoteItem($item) { - if(!in_array($item->getId(), $this->getAllowQuoteItems())) { + if (!in_array($item->getId(), $this->getAllowQuoteItems())) { if ($item->getGiftMessageId() && $this->isGiftMessagesAvailable($item)) { $this->addAllowQuoteItem($item->getId()); return true; @@ -240,7 +244,9 @@ public function getIsAllowedQuoteItem($item) public function isGiftMessagesAvailable($item) { return Mage::helper('giftmessage/message')->getIsMessagesAvailable( - 'item', $item, $item->getStore() + 'item', + $item, + $item->getStore() ); } @@ -260,7 +266,7 @@ public function importAllowQuoteItemsFromProducts($products) ->load($productId); $item = $this->_getQuote()->getItemByProduct($product); - if(!$item) { + if (!$item) { continue; } @@ -271,7 +277,6 @@ public function importAllowQuoteItemsFromProducts($products) && isset($data['giftmessage'])) { $allowedItems[] = $item->getId(); } - } $allowedItems = array_diff($allowedItems, $deleteAllowedItems); @@ -285,10 +290,9 @@ public function importAllowQuoteItemsFromItems($items) $allowedItems = $this->getAllowQuoteItems(); $deleteAllowedItems = []; foreach ($items as $itemId=>$data) { - $item = $this->_getQuote()->getItemById($itemId); - if(!$item) { + if (!$item) { // Clean not exists items $deleteAllowedItems[] = $itemId; continue; @@ -301,7 +305,6 @@ public function importAllowQuoteItemsFromItems($items) && isset($data['giftmessage'])) { $allowedItems[] = $item->getId(); } - } $allowedItems = array_diff($allowedItems, $deleteAllowedItems); @@ -324,11 +327,7 @@ protected function _getMappedType($type) 'order_item' => 'order_item' ]; - if (isset($map[$type])) { - return $map[$type]; - } - - return null; + return $map[$type] ?? null; } /** diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php index 65569ddc438..c400c044fea 100644 --- a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php +++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,9 +68,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..e743ce01d80 100644 --- a/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php +++ b/app/code/core/Mage/Adminhtml/Model/Newsletter/Renderer/Text.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Observer.php b/app/code/core/Mage/Adminhtml/Model/Observer.php index 1cbe773413f..9448eb125d3 100644 --- a/app/code/core/Mage/Adminhtml/Model/Observer.php +++ b/app/code/core/Mage/Adminhtml/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Model_Observer { - public function bindLocale($observer) { if ($locale=$observer->getEvent()->getLocale()) { diff --git a/app/code/core/Mage/Adminhtml/Model/Report/Item.php b/app/code/core/Mage/Adminhtml/Model/Report/Item.php index 0813e72216e..6ac4a159898 100644 --- a/app/code/core/Mage/Adminhtml/Model/Report/Item.php +++ b/app/code/core/Mage/Adminhtml/Model/Report/Item.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Report_Item extends Varien_Object { @@ -34,7 +41,8 @@ public function getIsEmpty() } public function hasIsEmpty() - {} + { + } public function getChildren() { diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php index 171a7ff68e7..519fa42c995 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -65,7 +66,11 @@ public function checkRelation(Mage_Sales_Model_Order $order) foreach ($order->getAllItems() as $item) { if (!$productCollection->getItemById($item->getProductId())) { $this->_getSession()->addError( - Mage::helper('adminhtml')->__('The item %s (SKU %s) does not exist in the catalog anymore.', $item->getName(), $item->getSku()) + Mage::helper('adminhtml')->__( + 'The item %s (SKU %s) does not exist in the catalog anymore.', + $item->getName(), + $item->getSku() + ) ); $hasBadItems = true; } @@ -77,6 +82,4 @@ public function checkRelation(Mage_Sales_Model_Order $order) } return $this; } - } - diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php index c0d4f4f7be5..8818f4f68aa 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,8 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method int getSendConfirmation() */ class Mage_Adminhtml_Model_Sales_Order_Create extends Varien_Object implements Mage_Checkout_Model_Cart_Interface { @@ -58,21 +61,21 @@ class Mage_Adminhtml_Model_Sales_Order_Create extends Varien_Object implements M /** * Re-collect quote flag * - * @var boolean + * @var bool */ protected $_needCollect; /** * Re-collect cart flag * - * @var boolean + * @var bool */ protected $_needCollectCart = false; /** * Collect (import) data and validate it flag * - * @var boolean + * @var bool */ protected $_isValidate = false; @@ -119,7 +122,7 @@ public function __construct() /** * Set validate data in import data flag * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setIsValidate($flag) @@ -131,7 +134,7 @@ public function setIsValidate($flag) /** * Return is validate data in import flag * - * @return boolean + * @return bool */ public function getIsValidate() { @@ -142,7 +145,7 @@ public function getIsValidate() * Retrieve quote item * * @param int|Mage_Sales_Model_Quote_Item $item - * @return Mage_Sales_Model_Quote_Item + * @return Mage_Sales_Model_Quote_Item|false */ protected function _getQuoteItem($item) { @@ -187,7 +190,8 @@ public function setRecollect($flag) * * @return Mage_Adminhtml_Model_Sales_Order_Create */ - public function recollectCart(){ + public function recollectCart() + { if ($this->_needCollectCart === true) { $this->getCustomerCart() ->collectTotals() @@ -279,8 +283,10 @@ public function initFromOrder(Mage_Sales_Model_Order $order) $session->setStoreId($order->getStoreId()); //Notify other modules about the session quote - Mage::dispatchEvent('init_from_order_session_quote_initialized', - ['session_quote' => $session]); + Mage::dispatchEvent( + 'init_from_order_session_quote_initialized', + ['session_quote' => $session] + ); /** * Initialize catalog rule data with new session values @@ -289,7 +295,7 @@ public function initFromOrder(Mage_Sales_Model_Order $order) foreach ($order->getItemsCollection( array_keys(Mage::getConfig()->getNode('adminhtml/sales/order/create/available_product_types')->asArray()), true - ) as $orderItem) { + ) as $orderItem) { /** @var Mage_Sales_Model_Order_Item $orderItem */ if (!$orderItem->getParentItem()) { if ($order->getReordered()) { @@ -463,7 +469,8 @@ public function getCustomerWishlist($cacheReload = false) if ($this->getSession()->getCustomer()->getId()) { $this->_wishlist = Mage::getModel('wishlist/wishlist')->loadByCustomer( - $this->getSession()->getCustomer(), true + $this->getSession()->getCustomer(), + true ); $this->_wishlist->setStore($this->getSession()->getStore()) ->setSharedStoreIds($this->getSession()->getStore()->getWebsite()->getStoreIds()); @@ -812,11 +819,9 @@ public function addProducts(array $products) $config['qty'] = isset($config['qty']) ? (float)$config['qty'] : 1; try { $this->addProduct($productId, $config); - } - catch (Mage_Core_Exception $e){ + } catch (Mage_Core_Exception $e) { $this->getSession()->addError($e->getMessage()); - } - catch (Exception $e){ + } catch (Exception $e) { return $e; } } @@ -907,7 +912,7 @@ protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalO Mage::helper('adminhtml')->__('There is an error in one of the option rows.') ); } - list($label,$value) = explode(':', $_additionalOption, 2); + list($label, $value) = explode(':', $_additionalOption, 2); } catch (Exception $e) { Mage::throwException(Mage::helper('adminhtml')->__('There is an error in one of the option rows.')); } @@ -1323,7 +1328,7 @@ public function importPostData($data) * Check whether we need to create new customer (for another website) during order creation * * @param Mage_Core_Model_Store $store - * @return boolean + * @return bool */ protected function _customerIsInStore($store) { @@ -1538,7 +1543,7 @@ public function createOrder() $oldOrder->cancel(); - if(!$oldOrder->isCanceled()){ + if (!$oldOrder->isCanceled()) { Mage::throwException('Could not cancel the old order during order edit.'); } } @@ -1663,7 +1668,7 @@ protected function _getNewCustomerEmail($customer) protected function _putCustomerIntoQuote() { if (!$this->getSession()->getCustomer()->getId()) { - /** @var Mage_Customer_Model_Customer*/ + /** @var Mage_Customer_Model_Customer $customer */ $customer = Mage::getModel('customer/customer'); $customer->addData($this->getBillingAddress()->exportCustomerAddress()->getData()) diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php index 71090237e2b..707aa96688e 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Create random order * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_Sales_Order_Random { @@ -74,13 +77,15 @@ protected function _getCustomers() protected function _getProducts() { if (!$this->_productCollection) { - $this->_productCollection= Mage::getResourceModel('catalog/product_collection'); - //$this->_productCollection->getEntity()->setStore($this->_getStore()); - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($this->_productCollection); + $this->_productCollection = Mage::getResourceModel('catalog/product_collection'); Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($this->_productCollection); - $this->_productCollection->addAttributeToSelect('name') + $this->_productCollection + ->addAttributeToSelect('name') ->addAttributeToSelect('sku') ->addAttributeToFilter('type_id', Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getVisibleStatusIds() + ]) ->load(); } return $this->_productCollection->getItems(); @@ -105,7 +110,7 @@ protected function _getRandomProduct() { $items = $this->_getProducts(); $randKey = array_rand($items); - return isset($items[$randKey]) ? $items[$randKey] : false; + return $items[$randKey] ?? false; } protected function _getStore() @@ -127,7 +132,7 @@ public function render() $this->_quote->getShippingAddress()->importCustomerAddress($customer->getDefaultShippingAddress()); $productCount = rand(3, 10); - for ($i=0; $i<$productCount; $i++){ + for ($i=0; $i<$productCount; $i++) { $product = $this->_getRandomProduct(); if ($product) { $product->setQuoteQty(1); @@ -146,8 +151,8 @@ public function render() protected function _getRandomDate() { - $timestamp = mktime(rand(0,23), rand(0,59), 0, rand(1,11), rand(1,28), rand(2006, 2007)); - return date('Y-m-d H:i:s', $timestamp); + $timestamp = mktime(rand(0, 23), rand(0, 59), 0, rand(1, 11), rand(1, 28), rand(2006, 2007)); + return date(Varien_Date::DATETIME_PHP_FORMAT, $timestamp); } public function save() diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php index 88641c084ed..be0002b5fbb 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Catalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,14 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method bool hasLimit() + * @method int getLimit() + * @method bool hasQuery() + * @method string getQuery() + * @method bool setResults(array $value) + * @method bool hasStart() + * @method int getStart() */ class Mage_Adminhtml_Model_Search_Catalog extends Varien_Object { diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php index b4bf7d5dd02..65ff24f76ef 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Customer.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,12 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method bool hasLimit() + * @method bool hasQuery() + * @method string getQuery() + * @method bool setResults(array $value) + * @method bool hasStart() */ class Mage_Adminhtml_Model_Search_Customer extends Varien_Object { diff --git a/app/code/core/Mage/Adminhtml/Model/Search/Order.php b/app/code/core/Mage/Adminhtml/Model/Search/Order.php index e538d662f57..df1d93bc1c9 100644 --- a/app/code/core/Mage/Adminhtml/Model/Search/Order.php +++ b/app/code/core/Mage/Adminhtml/Model/Search/Order.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +25,14 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method bool hasLimit() + * @method int getLimit() + * @method bool hasQuery() + * @method string getQuery() + * @method bool setResults(array $value) + * @method bool hasStart() + * @method int getStart() */ class Mage_Adminhtml_Model_Search_Order extends Varien_Object { diff --git a/app/code/core/Mage/Adminhtml/Model/Session.php b/app/code/core/Mage/Adminhtml/Model/Session.php index 3e999198482..26d4ccdb7c3 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session.php +++ b/app/code/core/Mage/Adminhtml/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -30,9 +31,6 @@ */ class Mage_Adminhtml_Model_Session extends Mage_Core_Model_Session_Abstract { - /** - * Mage_Adminhtml_Model_Session constructor. - */ public function __construct() { $this->init('adminhtml'); diff --git a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php index e3e7ea71baa..12311e5eb03 100644 --- a/app/code/core/Mage/Adminhtml/Model/Session/Quote.php +++ b/app/code/core/Mage/Adminhtml/Model/Session/Quote.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +25,23 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method array getAllowQuoteItemsGiftMessage() + * @method $this setAllowQuoteItemsGiftMessage(array $value) + * @method string getCurrencyId() + * @method $this setCurrencyId(string $value) + * @method bool hasCustomerId() + * @method int getCustomerId() + * @method $this setCustomerId(int $value) + * @method int getCustomerGroupId() + * @method int|string getOrderId() + * @method $this setOrderId(int|string $value) + * @method int|string getQuoteId() + * @method $this setQuoteId(int|string $value) + * @method $this setReordered(int|string $value) + * @method int getStoreId() + * @method $this setStoreId(int $value) + * @method bool getUseOldShippingMethod(bool $value) */ class Mage_Adminhtml_Model_Session_Quote extends Mage_Core_Model_Session_Abstract { @@ -77,8 +95,7 @@ public function getQuote() if ($this->getStoreId() && $this->getQuoteId()) { $this->_quote->setStoreId($this->getStoreId()) ->load($this->getQuoteId()); - } - elseif($this->getStoreId() && $this->hasCustomerId()) { + } elseif ($this->getStoreId() && $this->hasCustomerId()) { $this->_quote->setStoreId($this->getStoreId()) ->setCustomerGroupId(Mage::getStoreConfig(self::XML_PATH_DEFAULT_CREATEACCOUNT_GROUP)) ->assignCustomer($this->getCustomer()) @@ -104,7 +121,7 @@ public function setCustomer(Mage_Customer_Model_Customer $customer) return $this; } -/** + /** * Retrieve customer model object * @param bool $forceReload * @param bool $useSetStore diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php index 70b130c613a..acf93ad3103 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Custompath.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php index 69f207b83fa..c971b25596b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +31,7 @@ class Mage_Adminhtml_Model_System_Config_Backend_Admin_Custompath extends Mage_C /** * Check whether redirect should be set * - * @return Mage_Adminhtml_Model_System_Config_Backend_Admin_Custom + * @return $this */ protected function _beforeSave() { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php index 0dcbc90df85..8f82df2f2f7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Observer.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Admin_Observer { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php index 59483e692b4..ca9ff2f8b4a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Password/Link/Expirationperiod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,8 +26,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Model_System_Config_Backend_Admin_Password_Link_Expirationperiod - extends Mage_Core_Model_Config_Data +class Mage_Adminhtml_Model_System_Config_Backend_Admin_Password_Link_Expirationperiod extends Mage_Core_Model_Config_Data { /** * Validate expiration period value before saving 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..fa152a229a5 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5ca08d92212 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ac6b7f891b8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Baseurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php index ba9f444d066..bed0c992f39 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +40,7 @@ protected function _beforeSave() } } - $value = rtrim($value, '/'); + $value = rtrim($value, '/'); /** * If value is special ({{}}) we don't need add slash */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php index c15814081af..f873c845510 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cache.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Inventory/Managestock.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php index 1ae3c4a098e..b891b0d0f90 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Inventory/Managestock.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,8 +26,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock - extends Mage_Core_Model_Config_Data +class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Inventory_Managestock extends Mage_Core_Model_Config_Data { /** * @var Mage_CatalogInventory_Model_Stock_Status diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php index 269892b396e..2fb65e855fe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php @@ -1,5 +1,31 @@ + */ class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator extends Mage_Core_Model_Config_Data { /** 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..e9b8341bd6e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -30,7 +31,7 @@ class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Type extends Mag /** * After change Catalog Search Type process * - * @return Mage_Adminhtml_Model_System_Config_Catalog_Search_Type + * @return $this */ protected function _afterSave() { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php index f30b3255562..475666d8610 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Cookie.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php index 06bab1bb4f6..d5dc372ae8b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Cookie.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php index 642cd481dc5..1dd550608e3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php index d8e608e5799..7a801cb10fc 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Allow.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php index 530ab14a9e7..d1d81852590 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Base.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php index df5c30d880a..93db5a46c8e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php index 112164f28d4..cfbbd8f86d7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,11 +38,17 @@ class Mage_Adminhtml_Model_System_Config_Backend_Currency_Default extends Mage_A */ protected function _afterSave() { + $allowedCurrencies = $this->_getAllowedCurrencies(); + + if (!is_array($allowedCurrencies)) { + Mage::throwException(Mage::helper('adminhtml')->__('At least one currency has to be allowed.')); + } + if (!in_array($this->getValue(), $this->_getInstalledCurrencies())) { Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in installed currencies.')); } - if (!in_array($this->getValue(), $this->_getAllowedCurrencies())) { + if (!in_array($this->getValue(), $allowedCurrencies)) { Mage::throwException(Mage::helper('adminhtml')->__('Selected default display currency is not available in allowed currencies.')); } 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..afe3a432b05 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php index f071fb514ce..ad12b7d886b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Password/Link/Expirationperiod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,8 +26,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Model_System_Config_Backend_Customer_Password_Link_Expirationperiod - extends Mage_Core_Model_Config_Data +class Mage_Adminhtml_Model_System_Config_Backend_Customer_Password_Link_Expirationperiod extends Mage_Core_Model_Config_Data { /** * Validate expiration period value before saving diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php index 83bbb99a697..75b99dc8623 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Address.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Show/Customer.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php index 6317d73e61b..7bec7d45769 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,6 +25,8 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method string getField() */ class Mage_Adminhtml_Model_System_Config_Backend_Customer_Show_Customer extends Mage_Core_Model_Config_Data { @@ -66,11 +69,7 @@ protected function _afterSave() ]; $value = $this->getValue(); - if (isset($valueConfig[$value])) { - $data = $valueConfig[$value]; - } else { - $data = $valueConfig['']; - } + $data = $valueConfig[$value] ?? $valueConfig['']; if ($this->getScope() == 'websites') { $website = Mage::app()->getWebsite($this->getWebsiteCode()); @@ -86,7 +85,7 @@ protected function _afterSave() $attributeObject->load($attributeObject->getId()); } $attributeObject->setData($dataFieldPrefix . 'is_required', $data['is_required']); - $attributeObject->setData($dataFieldPrefix . 'is_visible', $data['is_visible']); + $attributeObject->setData($dataFieldPrefix . 'is_visible', $data['is_visible']); $attributeObject->save(); } @@ -108,7 +107,7 @@ protected function _afterDelete() $attributeObject->setWebsite($website); $attributeObject->load($attributeObject->getId()); $attributeObject->setData('scope_is_required', null); - $attributeObject->setData('scope_is_visible', null); + $attributeObject->setData('scope_is_visible', null); $attributeObject->save(); } } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php index 5a091650100..c69912470b5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Datashare.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php index c578879ec32..31d9c9318d4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Exception.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php index 9eb4eaca9ee..73ae422c6da 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Design/Package.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Backend_Design_Package extends Mage_Core_Model_Config_Data { protected function _beforeSave() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php index 6464c3a2e29..38700e47b95 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Email/Logo.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php index 4170d09e712..d728f3bc8f8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Logo.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** +/** * Backend model for uploading transactional emails custom logo image * * @category Mage @@ -60,7 +61,7 @@ protected function _getUploadDir() /** * Makes a decision about whether to add info about the scope * - * @return boolean + * @return bool */ protected function _addWhetherScopeInfo() { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php index 37c5456a182..55f016a85a7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Email/Sender.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Encrypted.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php index 0b6fe033eae..68033da302c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Encrypted.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +30,6 @@ class Mage_Adminhtml_Model_System_Config_Backend_Encrypted extends Mage_Core_Mod { /** * Decrypt value after loading - * */ protected function _afterLoad() { @@ -37,6 +37,7 @@ protected function _afterLoad() if (!empty($value) && ($decrypted = Mage::helper('core')->decrypt($value))) { $this->setValue($decrypted); } + return $this; } /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php index 97cbddf367a..35757772efa 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,7 +44,6 @@ protected function _beforeSave() { $value = $this->getValue(); if (!empty($_FILES['groups']['tmp_name'][$this->getGroupId()]['fields'][$this->getField()]['value'])) { - $uploadDir = $this->_getUploadDir(); try { @@ -55,9 +55,8 @@ protected function _beforeSave() $uploader = new Mage_Core_Model_File_Uploader($file); $uploader->setAllowedExtensions($this->_getAllowedExtensions()); $uploader->setAllowRenameFiles(true); - $this->addValidators( $uploader ); + $this->addValidators($uploader); $result = $uploader->save($uploadDir); - } catch (Exception $e) { Mage::throwException($e->getMessage()); return $this; @@ -100,7 +99,7 @@ public function validateMaxSize($filePath) /** * Makes a decision about whether to add info about the scope. * - * @return boolean + * @return bool */ protected function _addWhetherScopeInfo() { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php index eb21f266847..205e027fd16 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -50,8 +51,10 @@ protected function _beforeSave() // if dev/log setting, validate log file extension. if ($configPath == self::DEV_LOG_FILE_PATH || $configPath == self::DEV_LOG_EXCEPTION_FILE_PATH) { if (!Mage::helper('log')->isLogFileExtensionValid($value)) { - throw Mage::exception('Mage_Core', Mage::helper('adminhtml')->__ - ('Invalid file extension used for log file. Allowed file extensions: log, txt, html, csv')); + throw Mage::exception( + 'Mage_Core', + Mage::helper('adminhtml')->__('Invalid file extension used for log file. Allowed file extensions: log, txt, html, csv') + ); } } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php index 9380cd4d63e..d0b3151e0ae 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Gatewayurl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +26,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Model_System_Config_Backend_Gatewayurl extends Mage_Core_Model_Config_Data +class Mage_Adminhtml_Model_System_Config_Backend_Gatewayurl extends Mage_Core_Model_Config_Data { /** * Before save processing diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php index a9eb5ae8f3d..1c04e51b45b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php index 9eca7e831f7..c5a683024ff 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Favicon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +57,7 @@ protected function _getUploadDir() /** * Makes a decision about whether to add info about the scope. * - * @return boolean + * @return bool */ protected function _addWhetherScopeInfo() { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php index 1caba482f81..83af5181b94 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Image/Pdf.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Layer/Children.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php index 53d8c565f62..69fcaf4e21c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Layer/Children.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php index e2c4947008e..4e413652b7b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -70,8 +71,7 @@ protected function _afterSave() $currencyName = Mage::app()->getLocale()->currency($data->getValue())->getName(); if ($match[1] == 'base') { $fieldName = Mage::helper('adminhtml')->__('Base currency'); - } - else { + } else { $fieldName = Mage::helper('adminhtml')->__('Display default currency'); } @@ -101,5 +101,4 @@ protected function _afterSave() return $this; } - } 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..c2791316262 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,21 +28,9 @@ */ class Mage_Adminhtml_Model_System_Config_Backend_Locale_Timezone extends Mage_Core_Model_Config_Data { - /** - * Const for PHP 5.3+ compatibility - * This value copied from DateTimeZone::ALL_WITH_BC in PHP 5.3+ - * - * @constant ALL_WITH_BC - */ - const ALL_WITH_BC = 4095; - protected function _beforeSave() { - $allWithBc = self::ALL_WITH_BC; - if (defined('DateTimeZone::ALL_WITH_BC')) { - $allWithBc = DateTimeZone::ALL_WITH_BC; - } - + $allWithBc = DateTimeZone::ALL_WITH_BC; if (!in_array($this->getValue(), DateTimeZone::listIdentifiers($allWithBc))) { Mage::throwException(Mage::helper('adminhtml')->__('Invalid timezone')); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php index 5adfc189aa1..2e39d80c931 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Log/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,8 +54,7 @@ protected function _afterSave() ($frequency == $frequencyWeekly) ? '1' : '*', # Day of the Week ]; $cronExprString = implode(' ', $cronExprArray); - } - else { + } else { $cronExprString = ''; } @@ -70,8 +70,7 @@ protected function _afterSave() ->setValue((string) Mage::getConfig()->getNode(self::CRON_MODEL_PATH)) ->setPath(self::CRON_MODEL_PATH) ->save(); - } - catch (Exception $e) { + } catch (Exception $e) { Mage::throwException(Mage::helper('adminhtml')->__('Unable to save the cron expression.')); } return $this; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Passwordlength.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Passwordlength.php index 68939d06116..b3d12e0abcf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Passwordlength.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Passwordlength.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +25,7 @@ * @package Mage_Adminhtml * @author Magento Core Team */ -class Mage_Adminhtml_Model_System_Config_Backend_Passwordlength extends Mage_Core_Model_Config_Data +class Mage_Adminhtml_Model_System_Config_Backend_Passwordlength extends Mage_Core_Model_Config_Data { /** * Before save processing diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php index e1b2ffb22e7..de954335ec7 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Price/Scope.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price scope configuration option backend model * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Backend_Price_Scope extends Mage_Core_Model_Config_Data { -// protected $_eventPrefix = 'system_config_price_scope'; -// protected $_eventObject = 'option'; } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php index 35aa3dc2d03..b8a2e55100c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Protected.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Protected.php index 6be7d9e93c1..0a98559af5b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Protected.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Protected.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * System config protected fields backend model * - * @category Mage - * @package Mage_Adminhtml + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Backend_Protected extends Mage_Adminhtml_Model_System_Config_Backend_Symlink { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php index bd67963c2bf..bfab93da7cc 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Secure.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Secure extends Mage_Core_Model_Config_Data { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php index 97ecc865ff1..a67df035ab4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Seo/Product.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Seo_Product extends Mage_Core_Model_Config_Data { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php index 51de2b8aafd..4d65282f5fc 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php @@ -7,19 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Serialized extends Mage_Core_Model_Config_Data { + /** + * @return $this + */ protected function _afterLoad() { if (!is_array($this->getValue())) { @@ -35,6 +44,7 @@ protected function _afterLoad() } $this->setValue($unserializedValue); } + return $this; } /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php index 2bffcd454c0..435f46b0a3e 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..888deab9234 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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..ab84425ba7b 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 @@ -7,29 +7,33 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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(); - if ($value < 0 || $value > 1) { - throw new Exception(Mage::helper('sitemap')->__('The priority must be between 0 and 1.')); - } elseif (($value == 0) && !($value === '0' || $value === '0.0')) { - throw new Exception(Mage::helper('sitemap')->__('The priority must be between 0 and 1.')); - } + $value = $this->getValue(); + if ($value < 0 || $value > 1) { + throw new Exception(Mage::helper('sitemap')->__('The priority must be between 0 and 1.')); + } elseif (($value == 0) && !($value === '0' || $value === '0.0')) { + throw new Exception(Mage::helper('sitemap')->__('The priority must be between 0 and 1.')); + } return $this; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php index 9466bc23aa7..1b394947fe1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage/Media/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php index 61e2b90ba78..6596e67b4c3 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Storage/Media/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Store.php index 95d6fb5095c..855b5b8ceee 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6fb36168edb 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 @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..42036453488 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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/Web/Secure/Offloaderheader.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Web/Secure/Offloaderheader.php index 7880feef729..b327eda6091 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Web/Secure/Offloaderheader.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Web/Secure/Offloaderheader.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Web_Secure_Offloaderheader extends Mage_Core_Model_Config_Data { protected $_eventPrefix = 'core_config_backend_web_secure_offloaderheader'; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index fa96a424ac6..c97be1f6aa5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php index 5315638a00a..0f494bedec1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,7 +45,6 @@ protected function _createOptions(&$optionArray, $menuNode) $nonEscapableNbspChar = html_entity_decode(' ', ENT_NOQUOTES, 'UTF-8'); foreach ($menuNode as $menu) { - if (!empty($menu['url'])) { $optionArray[] = [ 'label' => str_repeat($nonEscapableNbspChar, ($menu['level'] * 4)) . $menu['label'], @@ -54,11 +54,10 @@ protected function _createOptions(&$optionArray, $menuNode) if (isset($menu['children'])) { $this->_createOptions($optionArray, $menu['children']); } - } - else { + } else { $children = []; - if(isset($menu['children'])) { + if (isset($menu['children'])) { $this->_createOptions($children, $menu['children']); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php index cfe82bbe083..cf4768c7d60 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Allregion.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +56,7 @@ public function toOptionArray($isMultiselect=false) } } $options = $this->_options; - if(!$isMultiselect){ + if (!$isMultiselect) { array_unshift($options, ['value'=>'', 'label'=>'']); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php index 6149d9af07a..b9553d27e2d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/GridPerPage.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/ListMode.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php index 3fd82f1e418..da333716c20 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListMode.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_ListMode { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php index 965b3c3db28..dcf9df953b6 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListPerPage.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Model_System_Config_Source_Catalog_ListPerPage { - public function toOptionArray() { $result = []; @@ -39,5 +39,4 @@ public function toOptionArray() //$result[] = array('value' => 'all', 'label' => Mage::helper('catalog')->__('All')); return $result; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php index 4e0a030c3b8..087f22e5e14 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/ListSort.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,8 +29,6 @@ class Mage_Adminhtml_Model_System_Config_Source_Catalog_ListSort { /** - * Retrieve option values array - * * @return array */ public function toOptionArray() @@ -53,7 +52,8 @@ public function toOptionArray() * * @return Mage_Catalog_Model_Config */ - protected function _getCatalogConfig() { + protected function _getCatalogConfig() + { return Mage::getSingleton('catalog/config'); } } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php index 7c149587fef..2c5562973fe 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php @@ -1,5 +1,31 @@ + */ class Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator { /** 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..db465f2119b 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7e7de8fe54c 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Category.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php index 9f0685317c5..aa72de3b471 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Checktype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php index 217fa544a38..79a7f8fa5d5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Checktype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php index 16698ac709d..feb8b242604 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Page.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Cms_Page { - protected $_options; public function toOptionArray() @@ -30,5 +36,4 @@ public function toOptionArray() } return $this->_options; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php index 93538927937..ac14085ddd5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Enabled.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Configuration source model for Wysiwyg toggling * * @category Mage - * @package Mage_Cms + * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Cms_Wysiwyg_Enabled diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cookie/Samesite.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cookie/Samesite.php index c462bd7610c..bc735472aac 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cookie/Samesite.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cookie/Samesite.php @@ -1,5 +1,29 @@ + */ class Mage_Adminhtml_Model_System_Config_Source_Cookie_Samesite { /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php index 0475362abed..07d4671fb8f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +35,7 @@ public function toOptionArray($isMultiselect=false) } $options = $this->_options; - if(!$isMultiselect){ + if (!$isMultiselect) { array_unshift($options, ['value'=>'', 'label'=> Mage::helper('adminhtml')->__('--Please Select--')]); } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php index 375c125d121..33f97b75625 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country/Full.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +26,8 @@ */ class Mage_Adminhtml_Model_System_Config_Source_Country_Full extends Mage_Adminhtml_Model_System_Config_Source_Country { - public function toOptionArray($isMultiselect=false) { + public function toOptionArray($isMultiselect=false) + { return parent::toOptionArray(true); } } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php index da7cac9adc3..2627d90e692 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cron/Frequency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php index 8d5481c2d88..8ecf40f4eb1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Currency/Service.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php index a92b524af06..e2ddcc95b58 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Currency/Service.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Currency_Service { protected $_options; 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..fc3b670247c 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Customer/Forgotpassword.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php index f83565fc7e7..c4327bc2f16 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Forgotpassword.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Customer/Group.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php index a4081424844..896cb1e7674 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Customer/Group/Multiselect.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php index ebbe4d0f15e..c7c75b92352 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Customer/Group/Multiselect.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Model_System_Config_Source_Customer_Group_Multiselect { /** 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..2e635e2cd2b 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Design/Package.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php index 9e95d516b48..2afd4fdd413 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Package.php @@ -7,23 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Package { - public function toOptionArray() { $dir = new Varien_Io_File(); #$dir->open(array('path'=>Mage::getStore)) } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php index 1f97daf90d1..f8b4cb77ae1 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Design/Robots.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Design_Robots { public function toOptionArray() diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php index b4284633533..08aaf221852 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Dev/Dbautoup.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Email/Identity.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php index 580603cfb5f..1e683956a80 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Identity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Email/Method.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php index 96898e55eb6..4cae2d6bcd8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Method.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Email/Smtpauth.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Email/Smtpauth.php index bf44985e92a..86c4ceb52f8 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..56905475842 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,12 +25,13 @@ * @category Mage * @package Mage_Adminhtml * @author Magento Core Team + * + * @method string getPath() */ class Mage_Adminhtml_Model_System_Config_Source_Email_Template extends Varien_Object { /** * Config xpath to email template node - * */ const XML_PATH_TEMPLATE_EMAIL = 'global/template/email/'; @@ -40,7 +42,7 @@ class Mage_Adminhtml_Model_System_Config_Source_Email_Template extends Varien_Ob */ public function toOptionArray() { - if(!$collection = Mage::registry('config_system_email_template')) { + if (!$collection = Mage::registry('config_system_email_template')) { $collection = Mage::getResourceModel('core/email_template_collection') ->load(); @@ -63,5 +65,4 @@ public function toOptionArray() ); return $options; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php index 05a15443daf..8a55f42b674 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Enabledisable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php index 381db8e3c65..c624ce375ec 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Frequency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Language.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php index df80c51eeb0..5858b40876d 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Language.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Language { protected $_options; @@ -28,7 +34,7 @@ public function toOptionArray($isMultiselect) $this->_options = Mage::getResourceModel('core/language_collection')->loadData()->toOptionArray(); } $options = $this->_options; - if(!$isMultiselect){ + if (!$isMultiselect) { array_unshift($options, ['value'=>'', 'label'=>'']); } return $options; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php index 8984afe14c5..d61513ad4d2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Locale source * - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Model_System_Config_Source_Locale { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php index 869ffb1bd95..5642d60198c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Currency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php index 96e5924cfd7..dd759e23766 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @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/Currency/All.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php index cff87483d32..5945eaec5ac 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Locale/Currency/All.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +34,7 @@ public function toOptionArray($isMultiselect) $this->_options = Mage::app()->getLocale()->getOptionAllCurrencies(); } $options = $this->_options; - if(!$isMultiselect){ + if (!$isMultiselect) { array_unshift($options, ['value'=>'', 'label'=>'']); } 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..c8f90d7f4b8 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 @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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..29349bcb1b2 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 @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..7cfb5629417 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 @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Log/Level.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Log/Level.php index 882096ba3b1..32dd22b5a72 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Log/Level.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Log/Level.php @@ -1,9 +1,30 @@ */ class Mage_Adminhtml_Model_System_Config_Source_Log_Level { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php index 9135e0cc529..5d6d8a4dc99 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Nooptreq.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Nooptreq { @@ -27,5 +34,4 @@ public function toOptionArray() ['value'=>'req', 'label'=>Mage::helper('adminhtml')->__('Required')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php index dc95604a449..0b2c958cbe8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Notification/Frequency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Order/Status.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status.php index ab1c6e30a86..28f4495e5e9 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -37,8 +42,7 @@ public function toOptionArray() { if ($this->_stateStatuses) { $statuses = Mage::getSingleton('sales/order_config')->getStateStatuses($this->_stateStatuses); - } - else { + } else { $statuses = Mage::getSingleton('sales/order_config')->getStatuses(); } $options = []; diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php index 0000ee8fa23..a6177bd5935 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/New.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_New extends Mage_Adminhtml_Model_System_Config_Source_Order_Status { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php index 6f2ebff0f13..46c8539a710 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Newprocessing.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Newprocessing extends Mage_Adminhtml_Model_System_Config_Source_Order_Status { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php index 29e3040dc58..e002f9bc6ff 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Order/Status/Processing.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Processing extends Mage_Adminhtml_Model_System_Config_Source_Order_Status { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php index bf32b401a87..9670d9d782f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allmethods.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Payment/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php index acd00e39612..ae29e0c2cdf 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allowedmethods.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Payment/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php index 377a217dff2..ef5bb5891e2 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Allspecificcountries.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Payment/Cctype.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php index 5082a36e5db..0a3580ed49c 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Payment/Cctype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Price/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php index 58a0b331f48..4e1fa56d021 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Price/Scope.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Scope { public function toOptionArray() 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..593b116af64 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Price.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php index 387b264c5cf..b0ce7294ab9 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Options/Type.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Product/Options/Type.php index c9cf72614ee..46a45a5f4d8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..72992868505 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,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/Reports/Scope.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php index e77fd814e95..d8e385c621a 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Reports/Scope.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,6 @@ */ class Mage_Adminhtml_Model_System_Config_Source_Reports_Scope { - /** - * Scope filter - */ public function toOptionArray() { return [ @@ -38,5 +36,4 @@ public function toOptionArray() ['value'=>'store', 'label'=>Mage::helper('adminhtml')->__('Store View')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php index 212b8f26333..655b3d231f4 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Security/Domainpolicy.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,7 +36,7 @@ class Mage_Adminhtml_Model_System_Config_Source_Security_Domainpolicy */ public function __construct($options = []) { - $this->_helper = isset($options['helper']) ? $options['helper'] : Mage::helper('adminhtml'); + $this->_helper = $options['helper'] ?? Mage::helper('adminhtml'); } /** diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php index 4e13a2006c1..ab6a953f0ea 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allmethods.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Shipping/Allowedmethods.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php index 56b0b6b2310..4fa667d3edd 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allowedmethods.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Shipping/Allspecificcountries.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php index a36ffe83ac8..7290cd8d933 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Allspecificcountries.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Shipping/Flatrate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php index 9162d3cd964..21acb44ad22 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Flatrate.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Shipping/Tablerate.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Shipping/Tablerate.php index d44cf8455a3..226c1cfe6b8 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2ca5a446e75 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 @@ -7,21 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Database.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php index 0412b29e339..04f63a23d1f 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage/Media/Storage.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Storage/Media/Storage.php index 54a5aff552f..961e3196af5 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 @@ -7,25 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +44,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..aff68b9623f 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tax/Apply/On.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php index 69f484908ba..e4225536446 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Apply/On.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Tax_Apply_On { @@ -26,5 +33,4 @@ public function toOptionArray() ['value'=>1, 'label'=>Mage::helper('tax')->__('Original price only')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php index 065e1ecde61..09609103cae 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Basedon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tax/Catalog.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php index 0e3493a86a5..dd5ae300204 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Tax/Catalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Watermark/Position.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php index b3f0f9712d0..d886cd347c5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Watermark/Position.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Model_System_Config_Source_Watermark_Position { - /** * Get available options * @@ -45,5 +45,4 @@ public function toOptionArray() ['value' => 'center', 'label' => Mage::helper('catalog')->__('Center')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php index f7284a69f3b..ade22d72c17 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Protocol.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Web_Protocol { - public function toOptionArray() { return [ @@ -28,5 +34,4 @@ public function toOptionArray() ['value'=>'https', 'label'=>Mage::helper('adminhtml')->__('HTTPS (SSL)')], ]; } - } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php index db5720c0347..f119efdb659 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Web/Redirect.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Web_Redirect { - public function toOptionArray() { return [ @@ -28,5 +34,4 @@ public function toOptionArray() ['value' => 301, 'label'=>Mage::helper('adminhtml')->__('Yes (301 Moved Permanently)')], ]; } - } 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..a7d9ef850ce 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..d3b2a5546c1 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 @@ -7,27 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..1bc0d1e76da 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 @@ -7,27 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +39,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..9bfbad15ea8 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_Model_System_Store extends Varien_Object { - /** * Website collection * websiteId => Mage_Core_Model_Website @@ -193,7 +193,6 @@ public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [ } foreach ($websites as $website) { - $websiteId = $website->getId(); if ($websiteIds && !in_array($websiteId, $websiteIds)) { continue; @@ -204,7 +203,6 @@ public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [ ]; foreach ($website->getGroups() as $group) { - $groupId = $group->getId(); if ($groupIds && !in_array($groupId, $groupIds)) { continue; @@ -215,7 +213,6 @@ public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [ ]; foreach ($group->getStores() as $store) { - $storeId = $store->getId(); if ($storeIds && !in_array($storeId, $storeIds)) { continue; @@ -319,7 +316,7 @@ public function getStoreGroupOptionHash($attribute = 'name') * Retrieve Website name by Id * * @param int $websiteId - * @return string + * @return string|null */ public function getWebsiteName($websiteId) { @@ -335,7 +332,7 @@ public function getWebsiteName($websiteId) * Retrieve Group name by Id * * @param int $groupId - * @return string + * @return string|null */ public function getGroupName($groupId) { @@ -351,7 +348,7 @@ public function getGroupName($groupId) * Retrieve Store name by Id * * @param int $storeId - * @return string + * @return string|null */ public function getStoreName($storeId) { @@ -369,10 +366,7 @@ public function getStoreName($storeId) **/ public function getStoreData($storeId) { - if (isset($this->_storeCollection[$storeId])) { - return $this->_storeCollection[$storeId]; - } - return null; + return $this->_storeCollection[$storeId] ?? null; } /** @@ -390,8 +384,7 @@ public function getStoreNameWithWebsite($storeId) $names[]= $this->getStoreNameWithWebsite($id); } $name = implode(', ', $names); - } - else { + } else { if (isset($this->_storeCollection[$storeId])) { $data = $this->_storeCollection[$storeId]; $name .= $this->getWebsiteName($data->getWebsiteId()); @@ -445,8 +438,7 @@ public function reload($type = null) $this->_loadWebsiteCollection(); $this->_loadGroupCollection(); $this->_loadStoreCollection(); - } - else { + } else { switch ($type) { case 'website': $this->_loadWebsiteCollection(); @@ -479,8 +471,7 @@ public function getStoreNamePath($storeId) $names[]= $this->getStoreNamePath($id); } $name = implode(', ', $names); - } - else { + } else { if (isset($this->_storeCollection[$storeId])) { $data = $this->_storeCollection[$storeId]; $name .= $this->getWebsiteName($data->getWebsiteId()); diff --git a/app/code/core/Mage/Adminhtml/Model/Url.php b/app/code/core/Mage/Adminhtml/Model/Url.php index ccdf95c8c9a..ee647c37c33 100644 --- a/app/code/core/Mage/Adminhtml/Model/Url.php +++ b/app/code/core/Mage/Adminhtml/Model/Url.php @@ -7,15 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * + * @method bool getNoSecret() + * @method $this setNoSecret(bool $avlue) */ class Mage_Adminhtml_Model_Url extends Mage_Core_Model_Url { @@ -80,8 +90,7 @@ public function getUrl($routePath=null, $routeParams=null) if ($cacheSecretKey) { $secret = [self::SECRET_KEY_PARAM_NAME => "\${$_controller}/{$_action}\$"]; - } - else { + } else { $secret = [self::SECRET_KEY_PARAM_NAME => $this->getSecretKey($_controller, $_action)]; } if (is_array($routeParams)) { @@ -122,7 +131,7 @@ public function getSecretKey($controller = null, $action = null) /** * Return secret key settings flag * - * @return boolean + * @return bool */ public function useSecretKey() { @@ -153,8 +162,6 @@ public function turnOffSecretKey() /** * Refresh admin menu cache etc. - * - * @return $this */ public function renewSecretUrls() { diff --git a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php index a855e6f0714..afd0534e050 100644 --- a/app/code/core/Mage/Adminhtml/controllers/AjaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/AjaxController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php index 98d15fd58c7..e1e67bf0664 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php index eedfd51494a..b80f4f5a416 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Api/UserController.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/CacheController.php index c47e3d40216..c2542841c35 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CacheController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Category/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php index a632fd33ca4..c6c6fa58357 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Category/WidgetController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 75f40aa7dc1..1c2f820e66e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +39,7 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle * Root category can be returned, if inappropriate store/category is specified * * @param bool $getRootInstead - * @return Mage_Catalog_Model_Category + * @return Mage_Catalog_Model_Category|false */ protected function _initCategory($getRootInstead = false) { @@ -46,7 +47,7 @@ protected function _initCategory($getRootInstead = false) ->_title($this->__('Categories')) ->_title($this->__('Manage Categories')); - $categoryId = (int) $this->getRequest()->getParam('id',false); + $categoryId = (int) $this->getRequest()->getParam('id', false); $storeId = (int) $this->getRequest()->getParam('store'); $category = Mage::getModel('catalog/category'); $category->setStoreId($storeId); @@ -59,8 +60,7 @@ protected function _initCategory($getRootInstead = false) // load root category instead wrong one if ($getRootInstead) { $category->load($rootId); - } - else { + } else { $this->_redirect('*/*/', ['_current'=>true, 'id'=>null]); return false; } @@ -119,12 +119,10 @@ public function editAction() if ($_prevCategoryId && !$this->getRequest()->getQuery('isAjax') && !$this->getRequest()->getParam('clear')) { - // $params['id'] = $_prevCategoryId; - $this->getRequest()->setParam('id',$_prevCategoryId); - //$redirect = true; + $this->getRequest()->setParam('id', $_prevCategoryId); } - if ($redirect) { + if ($redirect) { $this->_redirect('*/*/edit', $params); return; } @@ -163,8 +161,7 @@ public function editAction() // no need to get parent breadcrumbs if deleting category level 1 if (count($breadcrumbsPath) <= 1) { $breadcrumbsPath = ''; - } - else { + } else { array_pop($breadcrumbsPath); $breadcrumbsPath = implode('/', $breadcrumbsPath); } @@ -201,8 +198,9 @@ public function editAction() $this->getLayout()->getBlock('head')->setCanLoadExtJs(true) ->setContainerCssClass('catalog-categories'); - $this->_addBreadcrumb(Mage::helper('catalog')->__('Manage Catalog Categories'), - Mage::helper('catalog')->__('Manage Categories') + $this->_addBreadcrumb( + Mage::helper('catalog')->__('Manage Catalog Categories'), + Mage::helper('catalog')->__('Manage Categories') ); $block = $this->getLayout()->getBlock('catalog.wysiwyg.js'); @@ -276,8 +274,7 @@ public function saveAction() if (!$parentId) { if ($storeId) { $parentId = Mage::app()->getStore($storeId)->getRootCategoryId(); - } - else { + } else { $parentId = Mage_Catalog_Model_Category::TREE_ROOT_ID; } } @@ -306,9 +303,8 @@ public function saveAction() /** * Create Permanent Redirect for old URL key */ - if ($category->getId() && isset($data['general']['url_key_create_redirect'])) - // && $category->getOrigData('url_key') != $category->getData('url_key') - { + if ($category->getId() && isset($data['general']['url_key_create_redirect'])) { + // && $category->getOrigData('url_key') != $category->getData('url_key') $category->setData('save_rewrites_history', (bool)$data['general']['url_key_create_redirect']); } @@ -338,8 +334,7 @@ public function saveAction() foreach ($validate as $code => $error) { if ($error === true) { Mage::throwException(Mage::helper('catalog')->__('Attribute "%s" is required.', $category->getResource()->getAttribute($code)->getFrontend()->getLabel())); - } - else { + } else { Mage::throwException($error); } } @@ -353,8 +348,7 @@ public function saveAction() $category->save(); Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('catalog')->__('The category has been saved.')); $refreshTree = 'true'; - } - catch (Exception $e){ + } catch (Exception $e) { $this->_getSession()->addError($e->getMessage()) ->setCategoryData($data); $refreshTree = 'false'; @@ -388,15 +382,12 @@ public function moveAction() try { $category->move($parentNodeId, $prevNodeId); $this->getResponse()->setBody("SUCCESS"); - } - catch (Mage_Core_Exception $e) { + } catch (Mage_Core_Exception $e) { $this->getResponse()->setBody($e->getMessage()); - } - catch (Exception $e){ + } catch (Exception $e) { $this->getResponse()->setBody(Mage::helper('catalog')->__('Category move error %s', $e)); Mage::logException($e); } - } /** @@ -413,13 +404,11 @@ public function deleteAction() $category->delete(); Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('catalog')->__('The category has been deleted.')); - } - catch (Mage_Core_Exception $e){ + } catch (Mage_Core_Exception $e) { Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); $this->getResponse()->setRedirect($this->getUrl('*/*/edit', ['_current'=>true])); return; - } - catch (Exception $e){ + } catch (Exception $e) { Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('An error occurred while trying to delete the category.')); $this->getResponse()->setRedirect($this->getUrl('*/*/edit', ['_current'=>true])); return; diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php index 5e1b71c0b0a..640376f9b68 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/Action/AttributeController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -199,7 +200,7 @@ public function saveAction() /** * Validate selection of products for massupdate * - * @return boolean + * @return bool */ protected function _validateProducts() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php index cbb1a8714fb..44fb5398779 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,6 +56,7 @@ public function preDispatch() $this->_setForcedFormKeyActions('delete'); parent::preDispatch(); $this->_entityTypeId = Mage::getModel('eav/entity')->setType(Mage_Catalog_Model_Product::ENTITY)->getTypeId(); + return $this; } protected function _initAction() diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php index 27ad0678359..800342270a5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/DatafeedsController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/GalleryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php index 4be6f2b7494..fe110f6788a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php index 86e19ad819f..216ba949687 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GroupController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php index 31e990ecb70..518ea3652dc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Catalog_Product_ReviewController extends Mage_Adminhtml_Controller_Action { /** 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..47144193a8c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/SetController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..d6c1c9f7731 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index be7b4005bce..090945b2747 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -98,11 +99,14 @@ protected function _initProduct() } $attributes = $this->getRequest()->getParam('attributes'); - if ($attributes && $product->isConfigurable() && - (!$productId || !$product->getTypeInstance()->getUsedProductAttributeIds())) { - $product->getTypeInstance()->setUsedProductAttributeIds( - explode(",", base64_decode(urldecode($attributes))) - ); + if ($attributes && $product->isConfigurable()) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(); + if (!$productId || !$productType->getUsedProductAttributeIds()) { + $productType->setUsedProductAttributeIds( + explode(",", base64_decode(urldecode($attributes))) + ); + } } // Required attributes of simple product for configurable creation @@ -207,10 +211,12 @@ public function newAction() $this->loadLayout('popup'); } else { $_additionalLayoutPart = ''; - if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE - && !($product->getTypeInstance()->getUsedProductAttributeIds())) - { - $_additionalLayoutPart = '_new'; + if ($product->getTypeId() === Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(); + if (!$productType->getUsedProductAttributeIds()) { + $_additionalLayoutPart = '_new'; + } } $this->loadLayout([ 'default', @@ -249,10 +255,12 @@ public function editAction() Mage::dispatchEvent('catalog_product_edit_action', ['product' => $product]); $_additionalLayoutPart = ''; - if ($product->getTypeId() == Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE - && !($product->getTypeInstance()->getUsedProductAttributeIds())) - { - $_additionalLayoutPart = '_new'; + if ($product->getTypeId() === Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(); + if (!$productType->getUsedProductAttributeIds()) { + $_additionalLayoutPart = '_new'; + } } $this->loadLayout([ @@ -1052,7 +1060,9 @@ public function quickCreateAction() $autogenerateOptions = []; $result['attributes'] = []; - foreach ($configurableProduct->getTypeInstance()->getConfigurableAttributes() as $attribute) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $configurableProduct->getTypeInstance(); + foreach ($productType->getConfigurableAttributes() as $attribute) { $value = $product->getAttributeText($attribute->getProductAttribute()->getAttributeCode()); $autogenerateOptions[] = $value; $result['attributes'][] = [ diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php index bb8ab3eca10..08e165ab2c9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + */ class Mage_Adminhtml_Catalog_SearchController extends Mage_Adminhtml_Controller_Action { /** diff --git a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php index b69f913ce74..b73f640bd7a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CatalogController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php index db0fcee5062..ffee51f2770 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..10256c9160a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Block/WidgetController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php index 84410cb178a..d1e68f87acc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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..39447298b3f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Page/WidgetController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index 79d7fe8f549..e37705b3db8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -7,27 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms manage pages controller * * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_Cms_PageController extends Mage_Adminhtml_Controller_Action { - /** * Init actions * diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php index b18d3be433c..214af1b9e63 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @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..dbc7c9d1da3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Cart/Product/Composite/CartController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php index 13ceb0f26c7..e5f63c4a7cd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/Cart/Product/Composite/CartController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php index 731e35caa7a..1946a745a3b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/ConfigController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php index 4a46eaf6b0b..5c5fdf61ba5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/OnlineController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php index 7d15bd9730c..3104f378fe5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/OnlineController.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Customer_OnlineController extends Mage_Adminhtml_Controller_Action { /** 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..3d251da0f74 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..f006eab1975 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index f0bfcf93cd1..66dd2611b4a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,6 +45,11 @@ public function preDispatch() return parent::preDispatch(); } + /** + * @param string $idFieldName + * @return $this + * @throws Mage_Core_Exception + */ protected function _initCustomer($idFieldName = 'id') { $this->_title($this->__('Customers'))->_title($this->__('Manage Customers')); @@ -134,7 +140,7 @@ public function editAction() $addressForm->setFormCode('adminhtml_customer_address'); foreach (array_keys($data['address']) as $addressId) { - if ($addressId == '_template_') { + if ($addressId === '_template_') { continue; } @@ -221,11 +227,7 @@ public function saveAction() && Mage::helper('customer')->getIsRequireAdminUserToChangeUserPassword() ) { //Validate current admin password - if (isset($data['account']['current_password'])) { - $currentPassword = $data['account']['current_password']; - } else { - $currentPassword = null; - } + $currentPassword = $data['account']['current_password'] ?? null; unset($data['account']['current_password']); $errors = $this->_validateCurrentPassword($currentPassword); } @@ -335,7 +337,7 @@ public function saveAction() $customer->setPassword($data['account']['password']); $customer->setPasswordCreatedAt(time()); $customer->setForceConfirmed(true); - if ($customer->getPassword() == 'auto') { + if ($customer->getPassword() === 'auto') { $sendPassToEmail = true; $customer->setPassword($customer->generatePassword()); } @@ -361,7 +363,7 @@ public function saveAction() if (!empty($data['account']['new_password'])) { $newPassword = trim($data['account']['new_password']); - if ($newPassword == 'auto') { + if ($newPassword === 'auto') { $newPassword = $customer->generatePassword(); } else { $minPasswordLength = Mage::getModel('customer/customer')->getMinPasswordLength(); @@ -446,7 +448,6 @@ protected function _sendUploadResponse($fileName, $content, $contentType='applic /** * Customer orders grid - * */ public function ordersAction() { $this->_initCustomer(); @@ -456,7 +457,6 @@ public function ordersAction() { /** * Customer last orders grid for ajax - * */ public function lastOrdersAction() { $this->_initCustomer(); @@ -466,7 +466,6 @@ public function lastOrdersAction() { /** * Customer newsletter grid - * */ public function newsletterAction() { @@ -504,7 +503,6 @@ public function wishlistAction() /** * Customer last view wishlist for ajax - * */ public function viewWishlistAction() { @@ -515,8 +513,6 @@ public function viewWishlistAction() /** * [Handle and then] get a cart grid contents - * - * @return string */ public function cartAction() { @@ -543,7 +539,6 @@ public function cartAction() /** * Get shopping cart to view only - * */ public function viewCartAction() { @@ -557,7 +552,6 @@ public function viewCartAction() /** * Get shopping carts from all websites for specified client - * */ public function cartsAction() { @@ -568,7 +562,6 @@ public function cartsAction() /** * Get customer's product reviews list - * */ public function productReviewsAction() { @@ -583,7 +576,6 @@ public function productReviewsAction() /** * Get customer's tags list - * */ public function productTagsAction() { @@ -660,7 +652,7 @@ public function validateAction() $addressForm = Mage::getModel('customer/form'); $addressForm->setFormCode('adminhtml_customer_address')->ignoreInvisible(false); foreach (array_keys($addressesData) as $index) { - if ($index == '_template_') { + if ($index === '_template_') { continue; } $address = $customer->getAddressItemById($index); diff --git a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php index 535f10516e8..ca080e36301 100644 --- a/app/code/core/Mage/Adminhtml/controllers/DashboardController.php +++ b/app/code/core/Mage/Adminhtml/controllers/DashboardController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/IndexController.php b/app/code/core/Mage/Adminhtml/controllers/IndexController.php index b52df69c4e2..14d8cc6cd21 100644 --- a/app/code/core/Mage/Adminhtml/controllers/IndexController.php +++ b/app/code/core/Mage/Adminhtml/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/JsonController.php b/app/code/core/Mage/Adminhtml/controllers/JsonController.php index f148522d2f8..0f8aa8325bb 100644 --- a/app/code/core/Mage/Adminhtml/controllers/JsonController.php +++ b/app/code/core/Mage/Adminhtml/controllers/JsonController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php index 8d2e99d1fd9..5ec7c3e2b65 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/EditorController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..7e10b0c86e3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ProblemController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php index f4e40e3ca94..a4b27be250f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/ProblemController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/QueueController.php b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php index 7951ce2ef21..6dec8a75f96 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/QueueController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..85404eaa7a5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/SubscriberController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..cd7c390bdc4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Manage Newsletter Template Controller @@ -31,7 +32,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/NotificationController.php b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php index a9d3fb95770..9ddc7bffdcd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/NotificationController.php +++ b/app/code/core/Mage/Adminhtml/controllers/NotificationController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php index 55221540983..579d1601b96 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php index a7cc75a9094..39087fe935d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -82,7 +83,6 @@ protected function _initRole($requestVariable = 'rid') /** * Show grid with roles existing in systems - * */ public function indexAction() { @@ -91,13 +91,11 @@ public function indexAction() ->_title($this->__('Roles')); $this->_initAction(); - $this->renderLayout(); } /** * Action for ajax request from grid - * */ public function roleGridAction() { @@ -107,7 +105,6 @@ public function roleGridAction() /** * Edit role action - * */ public function editRoleAction() { @@ -142,7 +139,6 @@ public function editRoleAction() /** * Remove role action - * */ public function deleteAction() { @@ -176,9 +172,9 @@ public function deleteAction() try { $role->delete(); - Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The role has been deleted.')); } catch (Exception $e) { + Mage::logException($e); Mage::getSingleton('adminhtml/session')->addError($this->__('An error occurred while deleting this role.')); } @@ -187,7 +183,6 @@ public function deleteAction() /** * Role form submit action to save or create new role - * */ public function saveRoleAction() { @@ -242,7 +237,7 @@ public function saveRoleAction() ->setResources($resource) ->saveRel(); - foreach($oldRoleUsers as $oUid) { + foreach ($oldRoleUsers as $oUid) { $this->_deleteUserFromRole($oUid, $role->getId()); } @@ -250,21 +245,19 @@ public function saveRoleAction() $this->_addUserToRole($nRuid, $role->getId()); } - $rid = $role->getId(); Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The role has been successfully saved.')); } catch (Mage_Core_Exception $e) { Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); } catch (Exception $e) { + Mage::logException($e); Mage::getSingleton('adminhtml/session')->addError($this->__('An error occurred while saving this role.')); } - //$this->getResponse()->setRedirect($this->getUrl("*/*/editrole/rid/$rid")); $this->_redirect('*/*/'); } /** * Action for ajax request from assigned users grid - * */ public function editrolegridAction() { @@ -306,7 +299,7 @@ protected function _addUserToRole($userId, $roleId) $user = Mage::getModel('admin/user')->load($userId); $user->setRoleId($roleId)->setUserId($userId); - if( $user->roleUserExists() === true ) { + if ($user->roleUserExists() === true) { return false; } else { $user->add(); @@ -343,6 +336,11 @@ public function refreshRolesAction() ->saveRel(); } + $users = Mage::getResourceModel('admin/user_collection'); + foreach ($users as $user) { + $user->getResource()->saveReloadAclFlag($user, 1); + } + Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The roles have been refreshed.')); } catch (Mage_Core_Exception $e) { Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index e39d67a0e25..a719e73eb9a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -155,17 +162,12 @@ public function saveAction() if (Mage::getStoreConfigFlag('admin/security/crate_admin_user_notification') && $isNew) { Mage::getModel('admin/user')->sendAdminNotification($model); } - if ( $uRoles = $this->getRequest()->getParam('roles', false) ) { - if (count($uRoles) === 1) { - $model->setRoleIds($uRoles) + if ($uRoles = $this->getRequest()->getParam('roles', false)) { + if (is_array($uRoles) && (count($uRoles) >= 1)) { + // with fix for previous multi-roles logic + $model->setRoleIds(array_slice($uRoles, 0, 1)) ->setRoleUserId($model->getUserId()) ->saveRelations(); - } else if (count($uRoles) > 1) { - //@FIXME: stupid fix of previous multi-roles logic. - //@TODO: make proper DB upgrade in the future revisions. - $rs = []; - $rs[0] = $uRoles[0]; - $model->setRoleIds( $rs )->setRoleUserId( $model->getUserId() )->saveRelations(); } } Mage::getSingleton('adminhtml/session')->addSuccess($this->__('The user has been saved.')); @@ -202,7 +204,7 @@ public function deleteAction() $currentUser = Mage::getSingleton('admin/session')->getUser(); if ($id = $this->getRequest()->getParam('user_id')) { - if ( $currentUser->getId() == $id ) { + if ($currentUser->getId() == $id) { Mage::getSingleton('adminhtml/session')->addError($this->__('You cannot delete your own account.')); $this->_redirect('*/*/edit', ['user_id' => $id]); return; diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php index 53c57972d51..c2d273686fc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php index 0461a91da23..e57e5e88a4c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Poll/AnswerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/PollController.php b/app/code/core/Mage/Adminhtml/controllers/PollController.php index 04496d247fe..32c1dca1dd1 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PollController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PollController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php index fcdfeb2dd02..35cc240aeb2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php index 597fbb8bc6b..fc0c345caf7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_QuoteController extends Mage_Adminhtml_Controller_Action { /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index e71be08052b..a9d28b468a7 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** @@ -38,9 +44,11 @@ public function chooserAction() switch ($request->getParam('attribute')) { case 'sku': $block = $this->getLayout()->createBlock( - 'adminhtml/promo_widget_chooser_sku', 'promo_widget_chooser_sku', + 'adminhtml/promo_widget_chooser_sku', + 'promo_widget_chooser_sku', ['js_form_object' => $request->getParam('form'), - ]); + ] + ); break; case 'category_ids': @@ -59,9 +67,10 @@ public function chooserAction() } $block = $this->getLayout()->createBlock( - 'adminhtml/catalog_category_checkboxes_tree', 'promo_widget_chooser_category_ids', - ['js_form_object' => $request->getParam('form')] - ) + 'adminhtml/catalog_category_checkboxes_tree', + 'promo_widget_chooser_category_ids', + ['js_form_object' => $request->getParam('form')] + ) ->setCategoryIds($ids) ; break; @@ -97,11 +106,11 @@ public function categoriesJsonAction() /** * Initialize category object in registry * - * @return Mage_Catalog_Model_Category + * @return Mage_Catalog_Model_Category|false */ protected function _initCategory() { - $categoryId = (int) $this->getRequest()->getParam('id',false); + $categoryId = (int) $this->getRequest()->getParam('id', false); $storeId = (int) $this->getRequest()->getParam('store'); $category = Mage::getModel('catalog/category'); diff --git a/app/code/core/Mage/Adminhtml/controllers/PromoController.php b/app/code/core/Mage/Adminhtml/controllers/PromoController.php index e8409291ee4..26d42b8a6fd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/PromoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/PromoController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/RatingController.php b/app/code/core/Mage/Adminhtml/controllers/RatingController.php index c5eb8791a45..a88a7681ee8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/RatingController.php +++ b/app/code/core/Mage/Adminhtml/controllers/RatingController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php index 60037dee73d..bd49dce0672 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php index 4703e8ec93c..5914a9a3a7a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ReviewController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php index ff7e9c8a2b0..4e2762563dc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ReviewController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php index c6845ad6a88..210f547c810 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ShopcartController.php b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php index 8f0276afdf2..a31c6140357 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/ShopcartController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..385a9ddbc22 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5f09d14fbb2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Report/TagController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/ReportController.php b/app/code/core/Mage/Adminhtml/controllers/ReportController.php index 905821c9819..1b7e17ea956 100644 --- a/app/code/core/Mage/Adminhtml/controllers/ReportController.php +++ b/app/code/core/Mage/Adminhtml/controllers/ReportController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php index d422a76b520..84364d1b6a8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Adminhtml Rss Controller * * @category Mage - * @package Mage_Rss + * @package Mage_Adminhtml * @author Magento Core Team */ class Mage_Adminhtml_Rss_CatalogController extends Mage_Adminhtml_Controller_Rss_Abstract diff --git a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php index 6d6bb987d52..e7d903cf539 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer reviews controller * * @category Mage - * @package Mage_Rss - * @author Magento Core Team + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Adminhtml_Rss_OrderController extends Mage_Adminhtml_Controller_Rss_Abstract { /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php index 4d7e6bd31f9..95fb5dfbe83 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Billing/AgreementController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php index 9e847b69503..4f3f6509f82 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/CreditmemoController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php index 8a654ffcac3..45aa4c9f54b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/InvoiceController.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_InvoiceController extends Mage_Adminhtml_Controller_Sales_Invoice { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index 4a514838110..4b5af2926b5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -475,8 +476,6 @@ public function cancelAction() /** * Saving quote and create order - * - * @throws Mage_Core_Exception */ public function saveAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php index 4469c12a2a2..6630d3f45dc 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,11 +38,7 @@ protected function _getItemData() $data = Mage::getSingleton('adminhtml/session')->getFormData(true); } - if (isset($data['items'])) { - $qtys = $data['items']; - } else { - $qtys = []; - } + $qtys = $data['items'] ?? []; return $qtys; } @@ -104,6 +101,10 @@ protected function _initCreditmemo($update = false) $orderId = $this->getRequest()->getParam('order_id'); if ($creditmemoId) { $creditmemo = Mage::getModel('sales/order_creditmemo')->load($creditmemoId); + if (!$creditmemo->getId()) { + $this->_getSession()->addError($this->__('The credit memo no longer exists.')); + return false; + } } elseif ($orderId) { $data = $this->getRequest()->getParam('creditmemo'); $order = Mage::getModel('sales/order')->load($orderId); @@ -196,7 +197,7 @@ public function viewAction() $this->_setActiveMenu('sales/order') ->renderLayout(); } else { - $this->_forward('noRoute'); + $this->_redirect('*/*'); } } diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php index b24e5f93034..4ab41a321fd 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/EditController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,15 +45,19 @@ public function startAction() $orderId = $this->getRequest()->getParam('order_id'); $order = Mage::getModel('sales/order')->load($orderId); + if (!$order->getId()) { + $this->_redirect('*/sales_order/'); + return; + } + try { - if ($order->getId()) { - $this->_getSession()->setUseOldShippingMethod(true); - $this->_getOrderCreateModel()->initFromOrder($order); - $this->_redirect('*/*'); - } - else { - $this->_redirect('*/sales_order/'); + if (!$order->canEdit()) { + Mage::throwException(Mage::helper('sales')->__('This order cannot be edited.')); } + + $this->_getSession()->setUseOldShippingMethod(true); + $this->_getOrderCreateModel()->initFromOrder($order); + $this->_redirect('*/*'); } catch (Mage_Core_Exception $e) { Mage::getSingleton('adminhtml/session')->addError($e->getMessage()); $this->_redirect('*/sales_order/view', ['order_id' => $orderId]); diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php index 5050b939b82..b3875105608 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,11 +34,7 @@ class Mage_Adminhtml_Sales_Order_InvoiceController extends Mage_Adminhtml_Contro protected function _getItemQtys() { $data = $this->getRequest()->getParam('invoice'); - if (isset($data['items'])) { - $qtys = $data['items']; - } else { - $qtys = []; - } + $qtys = $data['items'] ?? []; return $qtys; } 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..3ea135e1d11 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,11 +34,7 @@ class Mage_Adminhtml_Sales_Order_ShipmentController extends Mage_Adminhtml_Contr protected function _getItemQtys() { $data = $this->getRequest()->getParam('shipment'); - if (isset($data['items'])) { - $qtys = $data['items']; - } else { - $qtys = []; - } + $qtys = $data['items'] ?? []; return $qtys; } 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..2efe9dc7d7a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/View/GiftmessageController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php index d3b22ce5790..b8e9378c48e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/View/GiftmessageController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/OrderController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php index 4f0416f1076..8b9da92bb7c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/OrderController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -268,8 +269,8 @@ public function addCommentAction() try { $response = false; $data = $this->getRequest()->getPost('history'); - $notify = isset($data['is_customer_notified']) ? $data['is_customer_notified'] : false; - $visible = isset($data['is_visible_on_front']) ? $data['is_visible_on_front'] : false; + $notify = $data['is_customer_notified'] ?? false; + $visible = $data['is_visible_on_front'] ?? false; $order->addStatusHistoryComment($data['comment'], $data['status']) ->setIsVisibleOnFront($visible) diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php index bfc2bf66683..2a23b685841 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php @@ -7,21 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profiles view/management controller * - * TODO: implement ACL restrictions + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * + * @TODO: implement ACL restrictions */ class Mage_Adminhtml_Sales_Recurring_ProfileController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php index 3d4c76b396d..2fb9649d1d3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/ShipmentController.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..21c5e5f7182 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/TransactionsController.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/SalesController.php b/app/code/core/Mage/Adminhtml/controllers/SalesController.php index b85437c9da0..0f67f3dc45a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SalesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SalesController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php index 4ed70d938b4..3323984dd62 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SitemapController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SitemapController.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Google sitemap controller * * @category Mage - * @package Mage_Sitemap + * @package Mage_Adminhtml + * @author Magento Core Team */ class Mage_Adminhtml_SitemapController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php index 0e02a2d06b4..d5bba1018f6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/AccountController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php index a9edbbb7c91..08c0e5a3958 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/CacheController.php b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php index 4b5bfa519b8..94e336ecd9d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CacheController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php index ea8306cfbb7..419f9c2e886 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ConfigController.php b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php index f92d518b597..e88fcbd3b55 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -131,7 +132,7 @@ public function saveAction() $session = Mage::getSingleton('adminhtml/session'); /** @var Mage_Adminhtml_Model_Session $session */ - $groups = $this->getRequest()->getPost('groups'); + $groups = $this->getRequest()->getPost('groups', []); if (isset($_FILES['groups']['name']) && is_array($_FILES['groups']['name'])) { /** @@ -179,7 +180,10 @@ public function saveAction() Mage::dispatchEvent("admin_system_config_changed_section_{$section}", ['website' => $website, 'store' => $store] ); - $session->addSuccess(Mage::helper('adminhtml')->__('The configuration has been saved.')); + + if (!empty($groups)) { + $session->addSuccess(Mage::helper('adminhtml')->__('The configuration has been saved.')); + } } catch (Mage_Core_Exception $e) { foreach(explode("\n", $e->getMessage()) as $message) { @@ -289,6 +293,7 @@ protected function _isSectionAllowed($section) $this->setFlag('', self::FLAG_NO_DISPATCH, true); return false; } + return false; } /** diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php index 74aeb618867..35dc3c8555d 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php index b0ad554306c..db0dd9af3ef 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -234,6 +235,7 @@ public function batchRunAction() $batchImportModel = $batchModel->getBatchImportModel(); $importIds = $batchImportModel->getIdCollection(); + /** @var Mage_Catalog_Model_Convert_Adapter_Product $adapter */ $adapter = Mage::getModel($batchModel->getAdapter()); $adapter->setBatchParams($batchModel->getParams()); diff --git a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php index c5c35f585ac..382ff54a687 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/DesignController.php b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php index 0f26e33a04c..6f5c4fac392 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/DesignController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..5441198d5a5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..eacd6d90655 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/StoreController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,7 +48,7 @@ public function preDispatch() /** * Init actions * - * @return Mage_Adminhtml_Cms_PageController + * @return $this */ protected function _initAction() { @@ -504,6 +505,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..3e4d3071d02 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..0884f5a4547 100644 --- a/app/code/core/Mage/Adminhtml/controllers/SystemController.php +++ b/app/code/core/Mage/Adminhtml/controllers/SystemController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7259fdd3bab 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Adminhtml_TagController extends Mage_Adminhtml_Controller_Action { - protected function _initAction() { $this->loadLayout() @@ -152,7 +152,7 @@ public function saveAction() $data['name'] = trim($postData['tag_name']); $data['status'] = $postData['tag_status']; - $data['base_popularity'] = (isset($postData['base_popularity'])) ? $postData['base_popularity'] : 0; + $data['base_popularity'] = $postData['base_popularity'] ?? 0; $data['store'] = $postData['store_id']; if (!$model = $this->_initTag()) { diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php index 49a1d370ee3..50b2cd26fd8 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/CustomerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php index 4ef030d7a4c..ae54e6ad26f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/Class/ProductController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php index 0d35f4ea431..22e2ec3ab62 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/ClassController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php index 71fccd56309..a512f8e26f2 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,12 +26,10 @@ * @package Mage_Adminhtml * @author Magento Core Team */ - class Mage_Adminhtml_Tax_RateController extends Mage_Adminhtml_Controller_Action { /** * Show Main Grid - * */ public function indexAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php index 4642042578c..1b30b2e7dc9 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RuleController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,6 +116,9 @@ public function saveAction() $ruleModel->setData($postData); $ruleModel->setCalculateSubtotal($this->getRequest()->getParam('calculate_subtotal', 0)); + /** @var Mage_Adminhtml_Model_Session $session */ + $session = $this->_getSingletonModel('adminhtml/session'); + try { //Check if the rule already exists @@ -123,9 +127,7 @@ public function saveAction() } $ruleModel->save(); - - $this->_getSingletonModel('adminhtml/session') - ->addSuccess($this->_getHelperModel('tax')->__('The tax rule has been saved.')); + $session->addSuccess($this->_getHelperModel('tax')->__('The tax rule has been saved.')); if ($this->getRequest()->getParam('back')) { return $this->_redirect('*/*/edit', ['rule' => $ruleModel->getId()]); @@ -134,11 +136,10 @@ public function saveAction() return $this->_redirect('*/*/'); } catch (Mage_Core_Exception $e) { - $this->_getSingletonModel('adminhtml/session')->addError($e->getMessage()); + $session->addError($e->getMessage()); } catch (Exception $e) { - $this->_getSingletonModel('adminhtml/session') - ->addError($this->_getHelperModel('tax')->__('An error occurred while saving this tax rule.')); + $session->addError($this->_getHelperModel('tax')->__('An error occurred while saving this tax rule.')); } $this->_getSingletonModel('adminhtml/session')->setRuleData($postData); @@ -159,13 +160,16 @@ protected function _isValidRuleRequest($ruleModel) $ruleModel->getTaxProductClass() ); + /** @var Mage_Adminhtml_Model_Session $session */ + $session = $this->_getSingletonModel('adminhtml/session'); + //Remove the current one from the list $existingRules = array_diff($existingRules, [$ruleModel->getOrigData('code')]); //Verify if a Rule already exists. If not throw an error if (count($existingRules) > 0) { $ruleCodes = implode(",", $existingRules); - $this->_getSingletonModel('adminhtml/session')->addError( + $session->addError( $this->_getHelperModel('tax')->__('Rules (%s) already exist for the specified Tax Rate, Customer Tax Class and Product Tax Class combinations', $ruleCodes) ); return false; diff --git a/app/code/core/Mage/Adminhtml/controllers/TaxController.php b/app/code/core/Mage/Adminhtml/controllers/TaxController.php index e915f31eed7..8296d95b8c6 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TaxController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TaxController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2fbe59ee25c 100644 --- a/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/UrlrewriteController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 b90382d9c6e..c9d263f24fe 100644 --- a/app/code/core/Mage/Adminhtml/etc/adminhtml.xml +++ b/app/code/core/Mage/Adminhtml/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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_Adminhtml - * @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_Adminhtml + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 75b9afd14b8..818e2477db8 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -8,15 +8,16 @@ * 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_Adminhtml - * @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_Adminhtml + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 74aa8f06d18..a4f8735eec1 100644 --- a/app/code/core/Mage/Adminhtml/etc/jstranslator.xml +++ b/app/code/core/Mage/Adminhtml/etc/jstranslator.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_Adminhtml - * @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_Adminhtml + * @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/Api/Controller/Action.php b/app/code/core/Mage/Api/Controller/Action.php index 903fd117d0c..5074754f2d5 100644 --- a/app/code/core/Mage/Api/Controller/Action.php +++ b/app/code/core/Mage/Api/Controller/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Exception.php b/app/code/core/Mage/Api/Exception.php index f043487eaa0..1982e45e558 100644 --- a/app/code/core/Mage/Api/Exception.php +++ b/app/code/core/Mage/Api/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index 8d7a8025ba5..9023a8bf9cc 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Api_Helper_Data extends Mage_Core_Helper_Abstract { const XML_PATH_API_WSI = 'api/config/compliance_wsi'; + protected $_moduleName = 'Mage_Api'; + /** * Method to find adapter code depending on WS-I compatibility setting * @@ -40,7 +43,7 @@ public function getV2AdapterCode() } /** - * @return boolean + * @return bool */ public function isComplianceWSI() { diff --git a/app/code/core/Mage/Api/Model/Acl.php b/app/code/core/Mage/Api/Model/Acl.php index 0a55806d9fe..2e537afe38c 100644 --- a/app/code/core/Mage/Api/Model/Acl.php +++ b/app/code/core/Mage/Api/Model/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php index d7c2284cc05..fa0c72b400b 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Ip.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface { @@ -31,10 +32,10 @@ class Mage_Api_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface * Check whether ip is allowed * * @param Mage_Api_Model_Acl $acl - * @param Mage_Api_Model_Acl_Role $role - * @param Mage_Api_Model_Acl_Resource $resource - * @param string $privilege - * @return boolean + * @param Mage_Api_Model_Acl_Role|null $role + * @param Mage_Api_Model_Acl_Resource|null $resource + * @param string|null $privilege + * @return bool|null */ public function assert( Mage_Api_Model_Acl $acl, 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..ca3416e50d0 100644 --- a/app/code/core/Mage/Api/Model/Acl/Assert/Time.php +++ b/app/code/core/Mage/Api/Model/Acl/Assert/Time.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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 { @@ -31,10 +32,10 @@ class Mage_Api_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface * Assert time * * @param Mage_Api_Model_Acl $acl - * @param Mage_Api_Model_Acl_Role $role - * @param Mage_Api_Model_Acl_Resource $resource - * @param string $privilege - * @return boolean + * @param Mage_Api_Model_Acl_Role|null $role + * @param Mage_Api_Model_Acl_Resource|null $resource + * @param string|null $privilege + * @return bool|null */ public function assert( Mage_Api_Model_Acl $acl, diff --git a/app/code/core/Mage/Api/Model/Acl/Resource.php b/app/code/core/Mage/Api/Model/Acl/Resource.php index 70634a7ac98..29fa9f55724 100644 --- a/app/code/core/Mage/Api/Model/Acl/Resource.php +++ b/app/code/core/Mage/Api/Model/Acl/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Resource extends Zend_Acl_Resource { - } diff --git a/app/code/core/Mage/Api/Model/Acl/Role.php b/app/code/core/Mage/Api/Model/Acl/Role.php index 54357582836..8786c1fd9a8 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Acl/Role.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * User acl role * + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_Role _getResource() * @method Mage_Api_Model_Resource_Role getResource() * @method int getParentId() @@ -35,10 +40,6 @@ * @method Mage_Api_Model_Acl_Role setUserId(int $value) * @method string getRoleName() * @method Mage_Api_Model_Acl_Role setRoleName(string $value) - * - * @category Mage - * @package Mage_Api - * @author Magento Core Team */ class Mage_Api_Model_Acl_Role extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php index 5396fc3de91..f8a5058b4d5 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Generic.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Generic.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Group.php b/app/code/core/Mage/Api/Model/Acl/Role/Group.php index e3be2ac4fa4..5431df221e8 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Group.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php index 50cb25ba2b6..6c271c363cb 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Api_Model_Acl_Role_Registry extends Zend_Acl_Role_Registry { 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..c412a8ccccb 100644 --- a/app/code/core/Mage/Api/Model/Acl/Role/User.php +++ b/app/code/core/Mage/Api/Model/Acl/Role/User.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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/Config.php b/app/code/core/Mage/Api/Model/Config.php index 83cd7c29804..b3a6113bd08 100644 --- a/app/code/core/Mage/Api/Model/Config.php +++ b/app/code/core/Mage/Api/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -202,11 +203,7 @@ public function getAclAssert($name = '') return $asserts; } - if (isset($asserts->$name)) { - return $asserts->$name; - } - - return false; + return $asserts->$name ?? false; } /** @@ -222,11 +219,7 @@ public function getAclPrivilegeSet($name = '') return $sets; } - if (isset($sets->$name)) { - return $sets->$name; - } - - return false; + return $sets->$name ?? false; } /** diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php index 4c2cccf5e15..2686fc40a97 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php index 6cd567a583f..5c1ee3e34a6 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * ACL role 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_Acl_Role extends Mage_Api_Model_Resource_Acl_Role diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php index bdc3545076a..d5adf9e2943 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php index 9f7197e85b9..5162c0f6769 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role.php b/app/code/core/Mage/Api/Model/Mysql4/Role.php index dc01dedd69d..a20489e0912 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team * @deprecated */ class Mage_Api_Model_Mysql4_Role extends Mage_Api_Model_Resource_Role diff --git a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php index 7383aa9fb83..a355eb249fc 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles.php b/app/code/core/Mage/Api/Model/Mysql4/Roles.php index e410acefd58..171215e4cbf 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team * @deprecated */ class Mage_Api_Model_Mysql4_Roles extends Mage_Api_Model_Resource_Roles diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php index ca0234e0368..31821b4c7e6 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php index 767699e96eb..eb76fa05aa3 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules.php b/app/code/core/Mage/Api/Model/Mysql4/Rules.php index 1a08315c828..057d3e2ee27 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team * @deprecated */ class Mage_Api_Model_Mysql4_Rules extends Mage_Api_Model_Resource_Rules diff --git a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php index 5eac51ce021..d32091de75b 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Mysql4/User.php b/app/code/core/Mage/Api/Model/Mysql4/User.php index 6e026c13de7..9cebcbc3b7d 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/User/Collection.php b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php index 9133900035a..b4e752b13e4 100644 --- a/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Mysql4/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Abstract.php b/app/code/core/Mage/Api/Model/Resource/Abstract.php index 74568b1bf45..86aa102b63b 100644 --- a/app/code/core/Mage/Api/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Api/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Acl.php b/app/code/core/Mage/Api/Model/Resource/Acl.php index d25035565dc..be0ce0d65b5 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Acl/Role.php b/app/code/core/Mage/Api/Model/Resource/Acl/Role.php index 60fea1e53ff..e8fa3a49d74 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl/Role.php @@ -7,32 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * ACL role resource * - * @method $this setCreated(string $value) + * @category Mage + * @package Mage_Api + * @author Magento Core Team * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @method $this setCreated(string $value) */ class Mage_Api_Model_Resource_Acl_Role extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('api/role', 'role_id'); diff --git a/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php index 6a5ff9173de..4756c3301d9 100644 --- a/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php index ca755f434cb..a991af6d474 100644 --- a/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Role.php b/app/code/core/Mage/Api/Model/Resource/Role.php index 444f7729474..203c3220944 100644 --- a/app/code/core/Mage/Api/Model/Resource/Role.php +++ b/app/code/core/Mage/Api/Model/Resource/Role.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * ACL role resource * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team */ class Mage_Api_Model_Resource_Role extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('api/role', 'role_id'); diff --git a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php index 36f6cb5bbe6..454cf73f671 100644 --- a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Roles.php b/app/code/core/Mage/Api/Model/Resource/Roles.php index 1cfb7f2d12a..96a2663d62c 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * ACL roles resource * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team */ class Mage_Api_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstract { @@ -41,20 +42,16 @@ class Mage_Api_Model_Resource_Roles extends Mage_Core_Model_Resource_Db_Abstract */ protected $_ruleTable; - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('api/role', 'role_id'); - $this->_usersTable = $this->getTable('api/user'); - $this->_ruleTable = $this->getTable('api/rule'); + $this->_usersTable = $this->getTable('api/user'); + $this->_ruleTable = $this->getTable('api/rule'); } /** - * Action before save + * Process role before saving * * @param Mage_Core_Model_Abstract|Mage_Api_Model_Roles $role * @return $this @@ -74,8 +71,10 @@ protected function _beforeSave(Mage_Core_Model_Abstract $role) } else { $row = ['tree_level' => 0]; } + $role->setTreeLevel($row['tree_level'] + 1); $role->setRoleName($role->getName()); + return $this; } @@ -101,8 +100,8 @@ protected function _afterSave(Mage_Core_Model_Abstract $role) protected function _afterDelete(Mage_Core_Model_Abstract $role) { $adapter = $this->_getWriteAdapter(); - $adapter->delete($this->getMainTable(), ['parent_id=?'=>$role->getId()]); - $adapter->delete($this->_ruleTable, ['role_id=?'=>$role->getId()]); + $adapter->delete($this->getMainTable(), ['parent_id = ?' => (int) $role->getId()]); + $adapter->delete($this->_ruleTable, ['role_id = ?' => (int) $role->getId()]); return $this; } @@ -114,8 +113,8 @@ protected function _afterDelete(Mage_Core_Model_Abstract $role) */ public function getRoleUsers(Mage_Api_Model_Roles $role) { - $adapter = $this->_getReadAdapter(); - $select = $adapter->select() + $adapter = $this->_getReadAdapter(); + $select = $adapter->select() ->from($this->getMainTable(), ['user_id']) ->where('parent_id = ?', $role->getId()) ->where('role_type = ?', Mage_Api_Model_Acl::ROLE_TYPE_USER) @@ -127,19 +126,21 @@ public function getRoleUsers(Mage_Api_Model_Roles $role) * Update role users * * @param Mage_Api_Model_Roles $role - * @return boolean + * @return bool */ private function _updateRoleUsersAcl(Mage_Api_Model_Roles $role) { - $users = $this->getRoleUsers($role); + $users = $this->getRoleUsers($role); $rowsCount = 0; + if (count($users)) { $rowsCount = $this->_getWriteAdapter()->update( $this->_usersTable, ['reload_acl_flag' => 1], - ['user_id IN(?)' => $users] + ['user_id IN (?)' => $users] ); } + return $rowsCount > 0; } } diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php index 96c3a1e871c..e42c5c354fc 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php index e0997d78d3d..2511eb3b6ca 100644 --- a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/Rules.php b/app/code/core/Mage/Api/Model/Resource/Rules.php index 690e63c6eb7..5afa8a9164e 100644 --- a/app/code/core/Mage/Api/Model/Resource/Rules.php +++ b/app/code/core/Mage/Api/Model/Resource/Rules.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rules resource model * - * @category Mage - * @package Mage_Api - * @author Magento Core Team + * @category Mage + * @package Mage_Api + * @author Magento Core Team */ class Mage_Api_Model_Resource_Rules extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('api/rule', 'rule_id'); diff --git a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php index ad98638df2b..8c345b81401 100644 --- a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php index b7d338ad36b..70a7db91d1c 100644 --- a/app/code/core/Mage/Api/Model/Resource/User.php +++ b/app/code/core/Mage/Api/Model/Resource/User.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -67,7 +64,7 @@ public function recordLogin(Mage_Api_Model_User $user) $data = [ 'lognum' => $user->getLognum()+1, ]; - $condition = $this->_getReadAdapter()->quoteInto('user_id=?', $user->getUserId()); + $condition = $this->_getReadAdapter()->quoteInto('user_id = ?', $user->getUserId()); $this->_getWriteAdapter()->update($this->getTable('api/user'), $data, $condition); return $this; } @@ -263,7 +260,6 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) } $adapter = $this->_getWriteAdapter(); - $adapter->beginTransaction(); try { @@ -275,21 +271,22 @@ public function _saveRelations(Mage_Core_Model_Abstract $user) $rid = intval($rid); if ($rid > 0) { //$row = $this->load($user, $rid); + $row = ['tree_level' => 0]; } else { $row = ['tree_level' => 0]; } - $row = ['tree_level' => 0]; $data = [ - 'parent_id' => $rid, - 'tree_level' => $row['tree_level'] + 1, - 'sort_order' => 0, - 'role_type' => Mage_Api_Model_Acl::ROLE_TYPE_USER, - 'user_id' => $user->getId(), - 'role_name' => $user->getFirstname() + 'parent_id' => $rid, + 'tree_level' => $row['tree_level'] + 1, + 'sort_order' => 0, + 'role_type' => Mage_Api_Model_Acl::ROLE_TYPE_USER, + 'user_id' => $user->getId(), + 'role_name' => $user->getFirstname() ]; $adapter->insert($this->getTable('api/role'), $data); } + $adapter->commit(); } catch (Mage_Core_Exception $e) { $adapter->rollBack(); @@ -353,12 +350,12 @@ public function add(Mage_Core_Model_Abstract $user) $role = new Varien_Object(['tree_level' => 0]); } $adapter->insert($this->getTable('api/role'), [ - 'parent_id' => $user->getRoleId(), - 'tree_level'=> ($role->getTreeLevel() + 1), - 'sort_order'=> 0, - 'role_type' => Mage_Api_Model_Acl::ROLE_TYPE_USER, - 'user_id' => $user->getUserId(), - 'role_name' => $user->getFirstname() + 'parent_id' => $user->getRoleId(), + 'tree_level' => $role->getTreeLevel() + 1, + 'sort_order' => 0, + 'role_type' => Mage_Api_Model_Acl::ROLE_TYPE_USER, + 'user_id' => $user->getUserId(), + 'role_name' => $user->getFirstname() ]); return $this; @@ -383,9 +380,10 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user) $table = $this->getTable('api/role'); $condition = [ - "{$table}.user_id = ?" => $user->getUserId(), - "{$table}.parent_id = ?"=> $user->getRoleId() + $table.'.user_id = ?' => (int) $user->getUserId(), + $table.'.parent_id = ?' => (int) $user->getRoleId() ]; + $adapter->delete($table, $condition); return $this; } @@ -400,8 +398,8 @@ public function roleUserExists(Mage_Core_Model_Abstract $user) { $result = []; if ($user->getUserId() > 0) { - $adapter = $this->_getReadAdapter(); - $select = $adapter->select()->from($this->getTable('api/role')) + $adapter = $this->_getReadAdapter(); + $select = $adapter->select()->from($this->getTable('api/role')) ->where('parent_id = ?', $user->getRoleId()) ->where('user_id = ?', $user->getUserId()); $result = $adapter->fetchCol($select); diff --git a/app/code/core/Mage/Api/Model/Resource/User/Collection.php b/app/code/core/Mage/Api/Model/Resource/User/Collection.php index 5a5e0e39ed0..8794ac34392 100644 --- a/app/code/core/Mage/Api/Model/Resource/User/Collection.php +++ b/app/code/core/Mage/Api/Model/Resource/User/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Role.php b/app/code/core/Mage/Api/Model/Role.php index 0341e3331c8..d141d337070 100644 --- a/app/code/core/Mage/Api/Model/Role.php +++ b/app/code/core/Mage/Api/Model/Role.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Role item model * + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_Role _getResource() * @method Mage_Api_Model_Resource_Role getResource() * @method int getParentId() @@ -37,10 +42,6 @@ * @method $this setRoleName(string $value) * @method $this setCreated(string $value) * @method $this setModified(string $value) - * - * @category Mage - * @package Mage_Api - * @author Magento Core Team */ class Mage_Api_Model_Role extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Api/Model/Roles.php b/app/code/core/Mage/Api/Model/Roles.php index 2f9b78d3591..2d67e66d760 100644 --- a/app/code/core/Mage/Api/Model/Roles.php +++ b/app/code/core/Mage/Api/Model/Roles.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_Roles _getResource() * @method Mage_Api_Model_Resource_Roles getResource() * @method int getParentId() @@ -36,10 +41,6 @@ * @method string getName() * @method Mage_Api_Model_Role setName() setName(string $name) * @method int getPid() - * - * @category Mage - * @package Mage_Api - * @author Magento Core Team */ class Mage_Api_Model_Roles extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php index efed7b1569d..87d95053340 100644 --- a/app/code/core/Mage/Api/Model/Rules.php +++ b/app/code/core/Mage/Api/Model/Rules.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_Resource_Rules _getResource() * @method Mage_Api_Model_Resource_Rules getResource() * @method int getRoleId() @@ -33,10 +38,6 @@ * @method Mage_Api_Model_Rules setRoleType(string $value) * @method string getPermission() * @method Mage_Api_Model_Rules setPermission(string $value) - * - * @category Mage - * @package Mage_Api - * @author Magento Core Team */ class Mage_Api_Model_Rules extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Api/Model/Server.php b/app/code/core/Mage/Api/Model/Server.php index 2aee9cd5908..6576d8f926c 100644 --- a/app/code/core/Mage/Api/Model/Server.php +++ b/app/code/core/Mage/Api/Model/Server.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Api_Model_Server { - /** * Api Name by Adapter * @var string diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php index 60ab0afa646..ca60f503e63 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index 8a3394c6a51..d166447c24c 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -201,7 +202,7 @@ public function fault($code, $message) /** * Check whether Soap extension is loaded * - * @return boolean + * @return bool */ protected function _extensionLoaded() { 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..42e5f10543b 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Handler.php b/app/code/core/Mage/Api/Model/Server/Handler.php index 19f1024504a..a7df58b5f64 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Handler.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index 566e3324a28..4141584a3c2 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -109,7 +110,7 @@ protected function _isAllowed($resource, $privilege = null) /** * Check session expiration * - * @return boolean + * @return bool */ protected function _isSessionExpired() { @@ -334,7 +335,7 @@ public function multiCall($sessionId, array $calls = [], $options = []) } $apiPath = $call[0]; - $args = (isset($call[1]) ? $call[1] : []); + $args = $call[1] ?? []; list($resourceName, $methodName) = explode('.', $apiPath); @@ -484,7 +485,7 @@ public function resources($sessionId) 'title' => (string) $resource->title, 'description' => (isset($resource->description) ? (string)$resource->description : null), 'name' => $resourceName, - 'aliases' => (isset($resourcesAlias[$resourceName]) ? $resourcesAlias[$resourceName] : []), + 'aliases' => $resourcesAlias[$resourceName] ?? [], 'methods' => $methods ]; } 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..9912b92362a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Handler.php b/app/code/core/Mage/Api/Model/Server/V2/Handler.php index 7c1c49a10e3..23ab6ecf25b 100644 --- a/app/code/core/Mage/Api/Model/Server/V2/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/V2/Handler.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..8ddcb492f21 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php index 62dd49849a9..c00977b9b47 100644 --- a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php +++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +41,7 @@ public function __call($function, $args) { $args = $args[0]; - /** @var Mage_Api_Helper_Data */ + /** @var Mage_Api_Helper_Data $helper */ $helper = Mage::helper('api/data'); $helper->wsiArrayUnpacker($args); @@ -101,11 +102,10 @@ public function login($username, $apiKey = null) * Return called class and method names * * @param String $apiPath - * @return array|void + * @return array */ protected function _getResourceName($apiPath) { - list($resourceName, $methodName) = explode('.', $apiPath); if (empty($resourceName) || empty($methodName)) { @@ -119,11 +119,8 @@ protected function _getResourceName($apiPath) } $methodInfo = $resources->$resourceName->methods->$methodName; - $modelName = $this->_prepareResourceModelName((string) $resources->$resourceName->model); - $modelClass = Mage::getConfig()->getModelClassName($modelName); - $method = (isset($methodInfo->method) ? (string) $methodInfo->method : $methodName); return [$modelClass, $method]; diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php index 3140163ddda..63f88302fff 100644 --- a/app/code/core/Mage/Api/Model/Session.php +++ b/app/code/core/Mage/Api/Model/Session.php @@ -7,28 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Webservice api session * + * @category Mage + * @package Mage_Api + * @author Magento Core Team + * * @method Mage_Api_Model_User getUser() * @method $this setUser(Mage_Api_Model_User $user) * @method Mage_Api_Model_Acl getAcl() * @method $this setAcl(Mage_Api_Model_Acl $loadAcl) - * - * @category Mage - * @package Mage_Api - * @author Magento Core Team */ class Mage_Api_Model_Session extends Mage_Core_Model_Session_Abstract { @@ -187,7 +188,7 @@ public function isAllowed($resource, $privilege = null) * Check session expiration * * @param Mage_Api_Model_User $user - * @return boolean + * @return bool */ public function isSessionExpired($user) { @@ -220,8 +221,8 @@ public function isLoggedIn($sessId = false) /** * Renew user by session ID if session not expired * - * @param string $sessId - * @return boolean + * @param string $sessId + * @return bool */ protected function _renewBySessId($sessId) { diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php index 59601aa2030..0d93761bc27 100644 --- a/app/code/core/Mage/Api/Model/User.php +++ b/app/code/core/Mage/Api/Model/User.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +61,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() @@ -247,7 +241,7 @@ public function getAclRole() * * @param string $username * @param string $apiKey - * @return boolean + * @return bool * @throws Exception */ public function authenticate($username, $apiKey) diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config.php b/app/code/core/Mage/Api/Model/Wsdl/Config.php index 79916ca5c76..ebaeb729fd3 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php index 8e5a9b2ba46..8c622ae3fa6 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Base.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php index d8e0c7a3166..7d1b950f7f3 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,7 +52,7 @@ public function extend($source, $overwrite = false) * Extends one node * * @param Varien_Simplexml_Element $source - * @param boolean $overwrite + * @param bool $overwrite * @param string $elmNamespace * @return Varien_Simplexml_Element */ diff --git a/app/code/core/Mage/Api/controllers/IndexController.php b/app/code/core/Mage/Api/controllers/IndexController.php index f030d82dced..01dea44a288 100644 --- a/app/code/core/Mage/Api/controllers/IndexController.php +++ b/app/code/core/Mage/Api/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/controllers/SoapController.php b/app/code/core/Mage/Api/controllers/SoapController.php index e957bd98a55..2a769f44b43 100644 --- a/app/code/core/Mage/Api/controllers/SoapController.php +++ b/app/code/core/Mage/Api/controllers/SoapController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..cfc5d8d431b 100644 --- a/app/code/core/Mage/Api/controllers/V2/SoapController.php +++ b/app/code/core/Mage/Api/controllers/V2/SoapController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..8c047bfb3dd 100644 --- a/app/code/core/Mage/Api/controllers/XmlrpcController.php +++ b/app/code/core/Mage/Api/controllers/XmlrpcController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 e264d27e72f..8714b082d1d 100644 --- a/app/code/core/Mage/Api/etc/adminhtml.xml +++ b/app/code/core/Mage/Api/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 40ca6d9beea..2702f0b008e 100644 --- a/app/code/core/Mage/Api/etc/api.xml +++ b/app/code/core/Mage/Api/etc/api.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. (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/Api/etc/config.xml b/app/code/core/Mage/Api/etc/config.xml index 7f780b4fcc1..95f5131f6ce 100644 --- a/app/code/core/Mage/Api/etc/config.xml +++ b/app/code/core/Mage/Api/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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..f13c5e2d951 100644 --- a/app/code/core/Mage/Api/etc/system.xml +++ b/app/code/core/Mage/Api/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php b/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php index b2ceb40da23..b70af305660 100644 --- a/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php index 302e3adb3ce..49a12f98bea 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php index e2c75dac651..cfb6e2d31a6 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run("ALTER TABLE {$this->getTable('api_user')} ADD `sessid` VARCHAR(40) NOT NULL AFTER `lognum`;"); + $installer->endSetup(); diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php index 66f439e77da..6fa2947c3f8 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** * * @category Mage * @package Mage_Api - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" CREATE TABLE `{$installer->getTable('api/session')}` ( `user_id` mediumint(9) UNSIGNED NOT NULL, diff --git a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 25d949d4090..388bba28c26 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php index 904eb718d55..4ae67dfa438 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Api/sql/api_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php index e13004cbb39..491c98fb6a5 100644 --- a/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Api + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Api2/Block/Adminhtml/Attribute.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php index 62e0629497f..70a78e7351c 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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 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..ec5a30a7949 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Edit.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php index d00acda925c..c6eada7dace 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php index 4c11ec8da4f..a7a0d4dd1b6 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php index dd08fd39758..f32df29e915 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php index b1c0fe26626..32b9e04f864 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,21 +25,17 @@ * @category Mage * @package Mage_Api2 * @author Magento Core Team + * * @method Mage_Api2_Model_Acl_Global_Role getRole() * @method Mage_Api2_Block_Adminhtml_Attribute_Tab_Resource setRole(Mage_Api2_Model_Acl_Global_Role $role) */ class Mage_Api2_Block_Adminhtml_Attribute_Tab_Resource extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface { /** - * Tree model - * * @var Mage_Api2_Model_Acl_Global_Rule_Tree */ protected $_treeModel = false; - /** - * Constructor - */ public function __construct() { parent::__construct(); @@ -76,7 +73,7 @@ public function getResTreeJson() /** * Check if everything is allowed * - * @return boolean + * @return bool */ public function getEverythingAllowed() { 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..eff6ce84f60 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Permissions/User/Edit/Tab/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php index 1daee5f5ed5..e4e5b401121 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,10 +35,6 @@ class Mage_Api2_Block_Adminhtml_Permissions_User_Edit_Tab_Roles extends Mage_Adm */ protected $_selectedRoles; - /** - * Constructor - * Prepare grid parameters - */ public function __construct() { parent::__construct(); @@ -173,7 +170,7 @@ public function canShowTab() /** * Returns status flag about this tab hidden or not * - * @return true + * @return false */ public function isHidden() { diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php index 0a97ae20baf..19f91934089 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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..144c1dea164 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,9 +31,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..6e84987aa50 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Info.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php index 109f0eb496f..3775634409d 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php index c263738c3f5..03f4361dec1 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +25,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_Resources setRole(Mage_Api2_Model_Acl_Global_Role $role) */ @@ -43,9 +45,6 @@ class Mage_Api2_Block_Adminhtml_Roles_Tab_Resources extends Mage_Adminhtml_Block */ protected $_treeModel = false; - /** - * Constructor - */ public function __construct() { parent::__construct(); @@ -97,7 +96,7 @@ public function _prepareTreeModel() /** * Check if everything is allowed * - * @return boolean + * @return bool */ public function getEverythingAllowed() { 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..a07ba02123a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +25,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 +33,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..e373e26fd76 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,15 +25,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/Exception.php b/app/code/core/Mage/Api2/Exception.php index ed934dce35c..53de31599cb 100644 --- a/app/code/core/Mage/Api2/Exception.php +++ b/app/code/core/Mage/Api2/Exception.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Helper/Data.php b/app/code/core/Mage/Api2/Helper/Data.php index 2f4da986b8e..48aeacb7cd0 100644 --- a/app/code/core/Mage/Api2/Helper/Data.php +++ b/app/code/core/Mage/Api2/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,6 +45,8 @@ class Mage_Api2_Helper_Data extends Mage_Core_Helper_Abstract const XML_PATH_USER_TYPES = 'global/api2/user_types'; /**#@- */ + protected $_moduleName = 'Mage_Api2'; + /** * Compare order to be used in adapters list sort * diff --git a/app/code/core/Mage/Api2/Model/Acl.php b/app/code/core/Mage/Api2/Model/Acl.php index 1395274d046..a6544bd5426 100644 --- a/app/code/core/Mage/Api2/Model/Acl.php +++ b/app/code/core/Mage/Api2/Model/Acl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php index 89d1cb2fab8..f8253cef97d 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php index 195ce579da3..9ee9c018da3 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,9 +48,6 @@ class Mage_Api2_Model_Acl_Filter_Attribute extends Mage_Core_Model_Abstract */ protected $_permissionModel; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('api2/acl_filter_attribute'); diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php index ec248809730..e644649a107 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Operation source model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Acl_Filter_Attribute_Operation { diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php index dfb7a4f85ec..3c39816c620 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php @@ -7,29 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 filter ACL attribute resources permissions model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Acl_Filter_Attribute_ResourcePermission implements Mage_Api2_Model_Acl_PermissionInterface { /** - * Resources permissions - * * @var array */ protected $_resourcesPermissions; diff --git a/app/code/core/Mage/Api2/Model/Acl/Global.php b/app/code/core/Mage/Api2/Model/Acl/Global.php index 83041343408..04396d6327a 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +34,7 @@ class Mage_Api2_Model_Acl_Global * @param Mage_Api2_Model_Auth_User_Abstract $apiUser * @param string $resourceType * @param string $operation - * @return boolean + * @return bool * @throws Mage_Api2_Exception */ public function isAllowed(Mage_Api2_Model_Auth_User_Abstract $apiUser, $resourceType, $operation) diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php index 165a7fd0a29..d8b1b475309 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 Global ACL Role model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team + * * @method Mage_Api2_Model_Resource_Acl_Global_Role_Collection getCollection() * @method Mage_Api2_Model_Resource_Acl_Global_Role_Collection getResourceCollection() * @method Mage_Api2_Model_Resource_Acl_Global_Role getResource() @@ -59,9 +61,6 @@ class Mage_Api2_Model_Acl_Global_Role extends Mage_Core_Model_Abstract */ protected $_permissionModel; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('api2/acl_global_role'); diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php index 106525b53cc..4e7f1f287f4 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 Global ACL Rule model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team + * * @method Mage_Api2_Model_Resource_Acl_Global_Rule_Collection getCollection() * @method Mage_Api2_Model_Resource_Acl_Global_Rule_Collection getResourceCollection() * @method Mage_Api2_Model_Resource_Acl_Global_Rule getResource() @@ -47,9 +49,6 @@ class Mage_Api2_Model_Acl_Global_Rule extends Mage_Core_Model_Abstract */ const RESOURCE_ALL = 'all'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('api2/acl_global_rule'); diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php index 457749e0b3b..074beed2bee 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Permission source model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Acl_Global_Rule_Permission { diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php index 575e52b65f2..8740323834c 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php @@ -7,29 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Privilege of rule source model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Acl_Global_Rule_Privilege { /** - * Get options parameters - * * @return array */ public static function toOptionArray() diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php index 846cded5f6d..a48f3535ef9 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php @@ -7,29 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 Global ACL role resources permissions model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Acl_Global_Rule_ResourcePermission implements Mage_Api2_Model_Acl_PermissionInterface { /** - * Resources permissions - * * @var array */ protected $_resourcesPermissions; @@ -79,10 +78,7 @@ public function getResourcesPermissions() foreach ($config->getResources() as $resourceType => $node) { $resourceId = (string)$resourceType; $allowedRoles = (array)$node->privileges; - $allowedPrivileges = []; - if (isset($allowedRoles[$roleConfigNodeName])) { - $allowedPrivileges = $allowedRoles[$roleConfigNodeName]; - } + $allowedPrivileges = $allowedRoles[$roleConfigNodeName] ?? []; foreach ($privileges as $privilege) { if (empty($allowedPrivileges[$privilege]) && isset($rulesPairs[$resourceId][$roleConfigNodeName]['privileges'][$privilege]) 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..b6053e791ce 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -238,7 +239,7 @@ public function getPostResources() /** * Check if everything is allowed * - * @return boolean + * @return bool */ public function getEverythingAllowed() { @@ -257,7 +258,7 @@ public function getTreeResources() { $this->_init(); $root = $this->_getTreeNode($this->_resourcesConfig, 1); - return isset($root[self::NAME_CHILDREN]) ? $root[self::NAME_CHILDREN] : []; + return $root[self::NAME_CHILDREN] ?? []; } /** @@ -265,7 +266,7 @@ public function getTreeResources() * * @param Varien_Simplexml_Element|array $node * @param int $level - * @return array + * @return array|null */ protected function _getTreeNode($node, $level = 0) { diff --git a/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php b/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php index 169b3c29fbc..c42e5371be1 100644 --- a/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php +++ b/app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 ACL resource permission interface * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ interface Mage_Api2_Model_Acl_PermissionInterface { diff --git a/app/code/core/Mage/Api2/Model/Auth.php b/app/code/core/Mage/Api2/Model/Auth.php index 6aca40aa9e2..c6a540eaf00 100644 --- a/app/code/core/Mage/Api2/Model/Auth.php +++ b/app/code/core/Mage/Api2/Model/Auth.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Adapter.php b/app/code/core/Mage/Api2/Model/Auth/Adapter.php index d7eabdc5b2b..9efe51360c9 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Adapter/Abstract.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php index a1f936fc7a3..882a848a6f2 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +42,7 @@ abstract public function getUserParams(Mage_Api2_Model_Request $request); * Check if request contains authentication info for adapter * * @param Mage_Api2_Model_Request $request - * @return boolean + * @return bool */ abstract public function isApplicableToRequest(Mage_Api2_Model_Request $request); } diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php index ce1f4876d5d..25aab29dfcf 100644 --- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php +++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -61,7 +62,7 @@ public function getUserParams(Mage_Api2_Model_Request $request) * Check if request contains authentication info for adapter * * @param Mage_Api2_Model_Request $request - * @return boolean + * @return bool */ public function isApplicableToRequest(Mage_Api2_Model_Request $request) { diff --git a/app/code/core/Mage/Api2/Model/Auth/User.php b/app/code/core/Mage/Api2/Model/Auth/User.php index 52b5cbf36ab..0c8fb1ed139 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User.php +++ b/app/code/core/Mage/Api2/Model/Auth/User.php @@ -7,30 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** * Get options in "key-value" format * - * @param boolean $asOptionArray OPTIONAL If TRUE - return an options array, plain array - otherwise + * @param bool $asOptionArray OPTIONAL If TRUE - return an options array, plain array - otherwise * @return array */ public static function getUserTypes($asOptionArray = false) diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php b/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php index 1b319116bde..7df3fa2a400 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Abstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Admin.php b/app/code/core/Mage/Api2/Model/Auth/User/Admin.php index 7798fbb5a06..56396da5044 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Admin.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Admin.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @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/Customer.php b/app/code/core/Mage/Api2/Model/Auth/User/Customer.php index be41ec16712..90c876c7bf1 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Customer.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Guest.php b/app/code/core/Mage/Api2/Model/Auth/User/Guest.php index 297e09ce51a..ab2c2f35743 100644 --- a/app/code/core/Mage/Api2/Model/Auth/User/Guest.php +++ b/app/code/core/Mage/Api2/Model/Auth/User/Guest.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Config.php b/app/code/core/Mage/Api2/Model/Config.php index e23c7dd367a..ac757ef8182 100644 --- a/app/code/core/Mage/Api2/Model/Config.php +++ b/app/code/core/Mage/Api2/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +46,7 @@ class Mage_Api2_Model_Config extends Varien_Simplexml_Config /** * Is resources added to group * - * @var boolean + * @var bool */ protected $_resourcesGrouped = false; @@ -179,11 +180,7 @@ public function getResourceGroups() /** @var Varien_Simplexml_Element $group */ $group = $result[0]; - if (!isset($group->children)) { - $children = new Varien_Simplexml_Element(''); - } else { - $children = $group->children; - } + $children = $group->children ?? new Varien_Simplexml_Element(''); $node->resource = 1; $children->appendChild($node); $group->appendChild($children); diff --git a/app/code/core/Mage/Api2/Model/Dispatcher.php b/app/code/core/Mage/Api2/Model/Dispatcher.php index af699a0766c..8299b797fd3 100644 --- a/app/code/core/Mage/Api2/Model/Dispatcher.php +++ b/app/code/core/Mage/Api2/Model/Dispatcher.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Multicall.php b/app/code/core/Mage/Api2/Model/Multicall.php index 5f8d80eeb7c..c9453f30c3c 100644 --- a/app/code/core/Mage/Api2/Model/Multicall.php +++ b/app/code/core/Mage/Api2/Model/Multicall.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Api2_Model_Multicall { - /** * @var Mage_Api2_Model_Request */ @@ -96,7 +96,6 @@ protected function _callSubresource($subresource) * * @param Mage_Core_Model_Config_Element $subresource * @param array $requestData - * @throws Mage_Api2_Exception * @return $this */ protected function _internalCall($subresource, $requestData) diff --git a/app/code/core/Mage/Api2/Model/Observer.php b/app/code/core/Mage/Api2/Model/Observer.php index dc5125e20c6..4738b955396 100644 --- a/app/code/core/Mage/Api2/Model/Observer.php +++ b/app/code/core/Mage/Api2/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 observer * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Observer { diff --git a/app/code/core/Mage/Api2/Model/Renderer.php b/app/code/core/Mage/Api2/Model/Renderer.php index 63ffb5a7ea0..83978bc004c 100644 --- a/app/code/core/Mage/Api2/Model/Renderer.php +++ b/app/code/core/Mage/Api2/Model/Renderer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Interface.php b/app/code/core/Mage/Api2/Model/Renderer/Interface.php index 825083e8175..c1a369333ec 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Interface.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Interface.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Json.php b/app/code/core/Mage/Api2/Model/Renderer/Json.php index 1961e43ed43..d33a47d829d 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Json.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Json.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Query.php b/app/code/core/Mage/Api2/Model/Renderer/Query.php index 2ec8e67bf0a..81e058ce5d0 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Query.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Query.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Api2/Model/Renderer/Xml.php index a7cf5537c78..78e3745d1c3 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..809e77649b1 100644 --- a/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +++ b/app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Api2/Model/Request.php index fb5fd07ffde..1c8056f04e7 100644 --- a/app/code/core/Mage/Api2/Model/Request.php +++ b/app/code/core/Mage/Api2/Model/Request.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -129,7 +130,7 @@ public function getAcceptTypes() public function getApiType() { // getParam() is not used to avoid parameter fetch from $_GET or $_POST - return isset($this->_params['api_type']) ? $this->_params['api_type'] : null; + return $this->_params['api_type'] ?? null; } /** @@ -189,7 +190,7 @@ public function getFilter() public function getModel() { // getParam() is not used to avoid parameter fetch from $_GET or $_POST - return isset($this->_params['model']) ? $this->_params['model'] : null; + return $this->_params['model'] ?? null; } /** @@ -278,7 +279,7 @@ public function getRequestedAttributes() public function getResourceType() { // getParam() is not used to avoid parameter fetch from $_GET or $_POST - return isset($this->_params['type']) ? $this->_params['type'] : null; + return $this->_params['type'] ?? null; } /** @@ -299,7 +300,7 @@ public function getVersion() public function getActionType() { // getParam() is not used to avoid parameter fetch from $_GET or $_POST - return isset($this->_params['action_type']) ? $this->_params['action_type'] : null; + return $this->_params['action_type'] ?? null; } /** diff --git a/app/code/core/Mage/Api2/Model/Request/Internal.php b/app/code/core/Mage/Api2/Model/Request/Internal.php index c779c50a5bb..c33af77e687 100644 --- a/app/code/core/Mage/Api2/Model/Request/Internal.php +++ b/app/code/core/Mage/Api2/Model/Request/Internal.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Api2/Model/Request/Interpreter.php index 8e68383fbd4..75d42c2a5fc 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Request content interpreter factory * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ abstract class Mage_Api2_Model_Request_Interpreter { diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php index d19e570d761..213f14e9f2a 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Request content interpreter adapter interface * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ interface Mage_Api2_Model_Request_Interpreter_Interface { diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php index 3d1413001ca..c9fe2290335 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Request content interpreter JSON 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_Json implements Mage_Api2_Model_Request_Interpreter_Interface { diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php index 787815270fa..3e0b9d791a1 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Request content interpreter query 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_Query implements Mage_Api2_Model_Request_Interpreter_Interface { @@ -61,7 +62,7 @@ public function interpret($body) * Returns true if and only if the query string passes validation. * * @param string $query The query to validate - * @return boolean + * @return bool * @link http://www.faqs.org/rfcs/rfc2396.html */ protected function _validateQuery($query) 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..ca2ab6ff275 100644 --- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -131,10 +132,10 @@ protected function _toArray(SimpleXMLElement $xmlObject) /** * Handle any errors from load xml * - * @param integer $errno + * @param int $errno * @param string $errstr * @param string $errfile - * @param integer $errline + * @param int $errline */ protected function _loadErrorHandler($errno, $errstr, $errfile, $errline) { diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php index 0cd71a84d6a..a2948232650 100644 --- a/app/code/core/Mage/Api2/Model/Resource.php +++ b/app/code/core/Mage/Api2/Model/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,6 +25,7 @@ * @category Mage * @package Mage_Api2 * @author Magento Core Team + * * @method string _create() _create(array $filteredData) creation of an entity * @method void _multiCreate() _multiCreate(array $filteredData) processing and creation of a collection * @method array _retrieve() retrieving an entity @@ -861,7 +863,7 @@ protected function _isSubCallAllowed($resourceId) /** * Set 'returnData' flag * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setReturnData($flag) diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php index 63326d46243..0028f5f8783 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,17 +33,12 @@ class Mage_Api2_Model_Resource_Acl_Filter_Attribute extends Mage_Core_Model_Reso */ const FILTER_RESOURCE_ALL = 'all'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('api2/acl_attribute', 'entity_id'); } /** - * Get allowed attributes - * * @param string $userType * @param string $resourceId * @param string $operation One of Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_... constant diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php index dcb8418ebb1..05ae15cecfc 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php index a8a43cea954..aca0ad643b7 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php @@ -7,32 +7,30 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 global ACL role resource model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team * * @method int getId() * @method string getRoleName() */ class Mage_Api2_Model_Resource_Acl_Global_Role extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize resource model - */ protected function _construct() { $this->_init('api2/acl_role', 'entity_id'); diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php index 132d13ab073..2503e804d6c 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php index 2c7060b4a70..1ddd85818d0 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API2 global ACL rule resource model * - * @category Mage - * @package Mage_Api2 - * @author Magento Core Team + * @category Mage + * @package Mage_Api2 + * @author Magento Core Team */ class Mage_Api2_Model_Resource_Acl_Global_Rule extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize resource model - */ protected function _construct() { $this->_init('api2/acl_rule', 'entity_id'); diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php index ca9e8a14d27..a83ba46a75a 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/Model/Resource/Setup.php b/app/code/core/Mage/Api2/Model/Resource/Setup.php index c848dd2e2c1..77d70d643a6 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Setup.php +++ b/app/code/core/Mage/Api2/Model/Resource/Setup.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..9bd018955cb 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php index 08c7c9742c9..01e113731a4 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -188,7 +189,7 @@ public function isValidData(array $data, $partial = false) if ($this->_eavForm->ignoreInvisible() && !$attribute->getIsVisible()) { continue; } - $attrValue = isset($data[$attribute->getAttributeCode()]) ? $data[$attribute->getAttributeCode()] : null; + $attrValue = $data[$attribute->getAttributeCode()] ?? null; $result = Mage_Eav_Model_Attribute_Data::factory($attribute, $this->_eavForm->getEntity()) ->setExtractedData($data) diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php index 9207fd5beb0..4aa4f872d0f 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -154,7 +155,7 @@ public function isValidData(array $data, $isPartial = false) if (!$isPartial && count($this->_requiredFields) > 0) { $notEmptyValidator = new Zend_Validate_NotEmpty(); foreach ($this->_requiredFields as $requiredField) { - if (!$notEmptyValidator->isValid(isset($data[$requiredField]) ? $data[$requiredField] : null)) { + if (!$notEmptyValidator->isValid($data[$requiredField] ?? null)) { $isValid = false; foreach ($notEmptyValidator->getMessages() as $message) { $this->_addError(sprintf('%s: %s', $requiredField, $message)); diff --git a/app/code/core/Mage/Api2/Model/Response.php b/app/code/core/Mage/Api2/Model/Response.php index 7c2d356f01a..ab2df5ba5c2 100644 --- a/app/code/core/Mage/Api2/Model/Response.php +++ b/app/code/core/Mage/Api2/Model/Response.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Route/Abstract.php b/app/code/core/Mage/Api2/Model/Route/Abstract.php index 0d81adbccd2..5de0f116164 100644 --- a/app/code/core/Mage/Api2/Model/Route/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Route/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -75,7 +76,7 @@ public function __construct(array $arguments) */ protected function _getArgumentValue($name, array $arguments) { - return isset($arguments[$name]) ? $arguments[$name] : $this->_paramsDefaultValues[$name]; + return $arguments[$name] ?? $this->_paramsDefaultValues[$name]; } /** @@ -83,7 +84,7 @@ protected function _getArgumentValue($name, array $arguments) * returns an array of variables on a successful match. * * @param Mage_Api2_Model_Request $request - * @param boolean $partial Partial path matching + * @param bool $partial Partial path matching * @return array|bool An array of assigned values or a boolean false on a mismatch */ public function match($request, $partial = false) diff --git a/app/code/core/Mage/Api2/Model/Route/ApiType.php b/app/code/core/Mage/Api2/Model/Route/ApiType.php index 20528224764..4ee8307c9cb 100644 --- a/app/code/core/Mage/Api2/Model/Route/ApiType.php +++ b/app/code/core/Mage/Api2/Model/Route/ApiType.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +42,7 @@ class Mage_Api2_Model_Route_ApiType extends Mage_Api2_Model_Route_Abstract imple * @param string $route Map used to match with later submitted URL path * @param array $defaults Defaults for map variables with keys as variable names * @param array $reqs Regular expression requirements for variables (keys as variable names) - * @param Zend_Translate $translator Translator to use for this instance + * @param Zend_Translate|null $translator Translator to use for this instance * @param mixed $locale */ public function __construct( diff --git a/app/code/core/Mage/Api2/Model/Route/Interface.php b/app/code/core/Mage/Api2/Model/Route/Interface.php index 0eaa129ca29..03e47b589b4 100644 --- a/app/code/core/Mage/Api2/Model/Route/Interface.php +++ b/app/code/core/Mage/Api2/Model/Route/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +33,7 @@ interface Mage_Api2_Model_Route_Interface * returns an array of variables on a successful match. * * @param Mage_Api2_Model_Request $request - * @param boolean $partial Partial path matching + * @param bool $partial Partial path matching * @return array|false An array of assigned values or a false on a mismatch */ public function match($request, $partial = false); diff --git a/app/code/core/Mage/Api2/Model/Route/Rest.php b/app/code/core/Mage/Api2/Model/Route/Rest.php index 7bdf0a43c45..3ead99a77d6 100644 --- a/app/code/core/Mage/Api2/Model/Route/Rest.php +++ b/app/code/core/Mage/Api2/Model/Route/Rest.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/Model/Router.php b/app/code/core/Mage/Api2/Model/Router.php index f4d1c78c9ea..fee02c46d4e 100644 --- a/app/code/core/Mage/Api2/Model/Router.php +++ b/app/code/core/Mage/Api2/Model/Router.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -93,7 +94,7 @@ public function route(Mage_Api2_Model_Request $request) * Set API type to request as a result of one pass route * * @param Mage_Api2_Model_Request $request - * @param boolean $trimApiTypePath OPTIONAL If TRUE - /api/:api_type part of request path info will be trimmed + * @param bool $trimApiTypePath OPTIONAL If TRUE - /api/:api_type part of request path info will be trimmed * @return $this * @throws Mage_Api2_Exception */ diff --git a/app/code/core/Mage/Api2/Model/Server.php b/app/code/core/Mage/Api2/Model/Server.php index eb15570a778..4bddcb07e5f 100644 --- a/app/code/core/Mage/Api2/Model/Server.php +++ b/app/code/core/Mage/Api2/Model/Server.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php index b91eac33692..e9a0d1233e8 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php index 6052795f808..ba73720904e 100644 --- a/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +++ b/app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Api2 + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 2768a1e713e..3e8bd9bae87 100644 --- a/app/code/core/Mage/Api2/etc/adminhtml.xml +++ b/app/code/core/Mage/Api2/etc/adminhtml.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_Api2 - * @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_Api2 + * @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/Api2/etc/config.xml b/app/code/core/Mage/Api2/etc/config.xml index f54e76fc325..4c0b663c836 100644 --- a/app/code/core/Mage/Api2/etc/config.xml +++ b/app/code/core/Mage/Api2/etc/config.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_Api2 - * @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_Api2 + * @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/Api2/sql/api2_setup/install-1.0.0.0.php b/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php index e69702f84a0..dc0c5bcfbb8 100644 --- a/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Api2 - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php index 4f34e16539f..47d00c04b50 100644 --- a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php +++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,7 +43,7 @@ protected function _construct() * Render block HTML * If method is not directpost - nothing to return * - * @return string + * @return string|null */ protected function _toHtml() { diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php index 37bb9a8cb05..ad9caa9e9f4 100644 --- a/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php +++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Helper/Admin.php b/app/code/core/Mage/Authorizenet/Helper/Admin.php index 2eb80301325..80e2aabb0e2 100644 --- a/app/code/core/Mage/Authorizenet/Helper/Admin.php +++ b/app/code/core/Mage/Authorizenet/Helper/Admin.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Authorizenet/Helper/Data.php b/app/code/core/Mage/Authorizenet/Helper/Data.php index a0e280eccd1..28d7c52385b 100644 --- a/app/code/core/Mage/Authorizenet/Helper/Data.php +++ b/app/code/core/Mage/Authorizenet/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Authorizenet_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Authorizenet'; + /** * Return URL for admin area * diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php index d81f6cb479a..4fb2616c784 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,7 +63,7 @@ public function validate() * * @param Varien_Object $payment * @param float $amount - * @return Mage_Paygate_Model_Authorizenet + * @return void * @throws Mage_Core_Exception */ public function authorize(Varien_Object $payment, $amount) @@ -328,6 +329,7 @@ public function initialize($paymentAction, $stateObject) switch ($paymentAction) { case self::ACTION_AUTHORIZE: case self::ACTION_AUTHORIZE_CAPTURE: + /** @var Mage_Authorizenet_Model_Directpost $payment */ $payment = $this->getInfoInstance(); $order = $payment->getOrder(); $order->setCanSendNewEmailFlag(false); diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php index 993748331ef..53d46922245 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Authorizenet directpayment observer * - * @category Mage - * @package Mage_Authorizenet - * @author Magento Core Team + * @category Mage + * @package Mage_Authorizenet + * @author Magento Core Team */ class Mage_Authorizenet_Model_Directpost_Observer { diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php index 62319014bda..7c8759f2716 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php index f71c4e0ffff..c4c6fe64631 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Response.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -150,7 +151,7 @@ public function generateSha2Hash($signatureKey) $message = '^'; foreach ($hashFields as $field) { $fieldData = $this->getData($field); - $message .= (isset($fieldData) ? $fieldData : '') . '^'; + $message .= ($fieldData ?? '') . '^'; } return strtoupper(hash_hmac('sha512', $message, pack('H*', $signatureKey))); diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php index fb3c6a1d92f..b246e1fe6de 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php index 08d089023fc..004b9e83ce7 100644 --- a/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php +++ b/app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Adminhtml/controllers/Sales/Order/CreateController.php'; @@ -23,7 +24,7 @@ * Admihtml DirtectPost Payment Controller * * @category Mage - * @package Mage_DirtectPost + * @package Mage_Authorizenet * @author Magento Core Team */ class Mage_Authorizenet_Adminhtml_Authorizenet_Directpost_PaymentController diff --git a/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php b/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php index 94ed212cb83..3b6f286fad9 100644 --- a/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php +++ b/app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Authorizenet + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -95,7 +96,7 @@ public function responseAction() $result['key'] = $data['key']; } $result['controller_action_name'] = $data['controller_action_name']; - $result['is_secure'] = isset($data['is_secure']) ? $data['is_secure'] : false; + $result['is_secure'] = $data['is_secure'] ?? false; $params['redirect'] = Mage::helper('authorizenet')->getRedirectIframeUrl($result); } $block = $this->_getIframeBlock()->setParams($params); diff --git a/app/code/core/Mage/Authorizenet/etc/config.xml b/app/code/core/Mage/Authorizenet/etc/config.xml index fde3c67fdf3..6995bc3ddfd 100644 --- a/app/code/core/Mage/Authorizenet/etc/config.xml +++ b/app/code/core/Mage/Authorizenet/etc/config.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. (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/Authorizenet/etc/system.xml b/app/code/core/Mage/Authorizenet/etc/system.xml index 9ee29dae61b..491b8389ec3 100644 --- a/app/code/core/Mage/Authorizenet/etc/system.xml +++ b/app/code/core/Mage/Authorizenet/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Backup/Exception.php b/app/code/core/Mage/Backup/Exception.php index 749206db25e..7da3d3f93af 100644 --- a/app/code/core/Mage/Backup/Exception.php +++ b/app/code/core/Mage/Backup/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Helper/Data.php b/app/code/core/Mage/Backup/Helper/Data.php index 2068d8fb1e0..068a6420963 100644 --- a/app/code/core/Mage/Backup/Helper/Data.php +++ b/app/code/core/Mage/Backup/Helper/Data.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -50,6 +51,8 @@ class Mage_Backup_Helper_Data extends Mage_Core_Helper_Abstract */ const TYPE_SNAPSHOT_WITHOUT_MEDIA = 'nomedia'; + protected $_moduleName = 'Mage_Backup'; + /** * Get all possible backup type values with descriptive title * @@ -109,7 +112,7 @@ public function getBackupsDir() public function getExtensionByType($type) { $extensions = $this->getExtensions(); - return isset($extensions[$type]) ? $extensions[$type] : ''; + return $extensions[$type] ?? ''; } /** @@ -143,7 +146,7 @@ public function generateBackupDownloadName(Mage_Backup_Model_Backup $backup) /** * Check Permission for Rollback * - * @return boolean + * @return bool */ public function isRollbackAllowed(){ return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup/rollback' ); diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php index 68f754f9f52..8fba58725fb 100644 --- a/app/code/core/Mage/Backup/Model/Backup.php +++ b/app/code/core/Mage/Backup/Model/Backup.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +73,7 @@ public function load($fileName, $filePath) /** * Checks backup file exists. * - * @return boolean + * @return bool */ public function exists() { diff --git a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php index a18fd344d8f..07ce8e2e66d 100644 --- a/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +++ b/app/code/core/Mage/Backup/Model/Config/Backend/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..943e15c16e0 100644 --- a/app/code/core/Mage/Backup/Model/Config/Source/Type.php +++ b/app/code/core/Mage/Backup/Model/Config/Source/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Backup/Model/Db.php b/app/code/core/Mage/Backup/Model/Db.php index a509a1a9492..1c0178b7968 100644 --- a/app/code/core/Mage/Backup/Model/Db.php +++ b/app/code/core/Mage/Backup/Model/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Fs/Collection.php b/app/code/core/Mage/Backup/Model/Fs/Collection.php index 6b5c3f5957a..1dffd66a952 100644 --- a/app/code/core/Mage/Backup/Model/Fs/Collection.php +++ b/app/code/core/Mage/Backup/Model/Fs/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Mysql4/Db.php b/app/code/core/Mage/Backup/Model/Mysql4/Db.php index a1611948a25..44015d1782d 100644 --- a/app/code/core/Mage/Backup/Model/Mysql4/Db.php +++ b/app/code/core/Mage/Backup/Model/Mysql4/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Observer.php b/app/code/core/Mage/Backup/Model/Observer.php index bae2fcb7c64..86fc487d2c9 100644 --- a/app/code/core/Mage/Backup/Model/Observer.php +++ b/app/code/core/Mage/Backup/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,7 +42,7 @@ class Mage_Backup_Model_Observer /** * Create Backup * - * @return Mage_Log_Model_Cron + * @return $this */ public function scheduledBackup() { diff --git a/app/code/core/Mage/Backup/Model/Resource/Db.php b/app/code/core/Mage/Backup/Model/Resource/Db.php index b57159b73d4..1d223f779d1 100644 --- a/app/code/core/Mage/Backup/Model/Resource/Db.php +++ b/app/code/core/Mage/Backup/Model/Resource/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php index 69d3fb6c80d..f14ae57bac0 100644 --- a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Backup + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Backup + * @author Magento Core Team + */ class Mage_Backup_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Mysql4 { /** @@ -55,7 +61,7 @@ public function getTableForeignKeysSql($tableName = null) foreach ($this->_foreignKeys as $table => $foreignKeys) { $sql .= $this->_buildForeignKeysAlterTableSql($table, $foreignKeys); } - } else if (isset($this->_foreignKeys[$tableName])) { + } elseif (isset($this->_foreignKeys[$tableName])) { $foreignKeys = $this->_foreignKeys[$tableName]; $sql = $this->_buildForeignKeysAlterTableSql($tableName, $foreignKeys); } @@ -76,7 +82,8 @@ protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys) return ''; } - return sprintf("ALTER TABLE %s\n %s;\n", + return sprintf( + "ALTER TABLE %s\n %s;\n", $this->_getReadAdapter()->quoteIdentifier($tableName), implode(",\n ", $foreignKeys) ); @@ -86,7 +93,7 @@ protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys) * Get create script for table * * @param string $tableName - * @param boolean $addDropIfExists + * @param bool $addDropIfExists * @return string */ public function getTableCreateScript($tableName, $addDropIfExists = false) @@ -109,7 +116,7 @@ public function getTableCreateScript($tableName, $addDropIfExists = false) * * @param string $tableName * @param bool $withForeignKeys - * @return string + * @return false|string */ public function getTableCreateSql($tableName, $withForeignKeys = false) { @@ -131,13 +138,14 @@ public function getTableCreateSql($tableName, $withForeignKeys = false) if (is_array($matches)) { foreach ($matches as $match) { - $this->_foreignKeys[$tableName][] = sprintf('ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s%s', + $this->_foreignKeys[$tableName][] = sprintf( + 'ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s%s', $adapter->quoteIdentifier($match[1]), $adapter->quoteIdentifier($match[2]), $adapter->quoteIdentifier($match[3]), $adapter->quoteIdentifier($match[4]), - isset($match[5]) ? $match[5] : '', - isset($match[7]) ? $match[7] : '' + $match[5] ?? '', + $match[7] ?? '' ); } } diff --git a/app/code/core/Mage/Backup/etc/adminhtml.xml b/app/code/core/Mage/Backup/etc/adminhtml.xml index 7608af05e79..e5d284a3472 100644 --- a/app/code/core/Mage/Backup/etc/adminhtml.xml +++ b/app/code/core/Mage/Backup/etc/adminhtml.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. (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/Backup/etc/config.xml b/app/code/core/Mage/Backup/etc/config.xml index a73bcdd4b24..898b2af7485 100644 --- a/app/code/core/Mage/Backup/etc/config.xml +++ b/app/code/core/Mage/Backup/etc/config.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. (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/Backup/etc/system.xml b/app/code/core/Mage/Backup/etc/system.xml index 9970d5559ad..f8eb3e2715b 100644 --- a/app/code/core/Mage/Backup/etc/system.xml +++ b/app/code/core/Mage/Backup/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Composite/Fieldset/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php index 43ac8f3b92e..e75e15ef6c8 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php index 2a612133a7f..06389395744 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php index 0d77e5d1361..602f694cce7 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option multi select type renderer * - * @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_Composite_Fieldset_Options_Type_Multi extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php index 930fe2fa766..f43063685aa 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option radiobox type renderer * - * @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_Composite_Fieldset_Options_Type_Radio extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Radio { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php index 150fe531095..26d5bc0e5ae 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option dropdown type renderer * - * @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_Composite_Fieldset_Options_Type_Select extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Select { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php index 7190e3c06b5..1057855e458 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php index 4fb0008b1f2..b63c30cc0a4 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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..acc54264047 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tab/Bundle.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php index 54c46acce80..f2147e15e3a 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -83,7 +84,7 @@ protected function _prepareLayout() /** * Check block readonly * - * @return boolean + * @return bool */ public function isReadonly() { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php index 8eeddd524d4..4d380c2585f 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method bool getCanEditPrice() * @method $this setCanEditPrice(bool $value) @@ -216,18 +217,22 @@ public function getAddSelectionButtonHtml() public function getOptions() { if (!$this->_options) { - $this->getProduct()->getTypeInstance(true)->setStoreFilter( - $this->getProduct()->getStoreId(), - $this->getProduct() + $product = $this->getProduct(); + /** @var Mage_Bundle_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + + $productType->setStoreFilter( + $product->getStoreId(), + $product ); /** @var Mage_Bundle_Model_Resource_Option_Collection $optionCollection */ - $optionCollection = $this->getProduct()->getTypeInstance(true)->getOptionsCollection($this->getProduct()); + $optionCollection = $productType->getOptionsCollection($product); /** @var Mage_Bundle_Model_Resource_Selection_Collection $selectionCollection */ - $selectionCollection = $this->getProduct()->getTypeInstance(true)->getSelectionsCollection( - $this->getProduct()->getTypeInstance(true)->getOptionsIds($this->getProduct()), - $this->getProduct() + $selectionCollection = $productType->getSelectionsCollection( + $productType->getOptionsIds($product), + $product ); $this->_options = $optionCollection->appendSelections($selectionCollection); diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php index aa37b770489..58e36597b49 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle selection product block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method bool getFirstShow() * @method $this setFirstShow(bool $value) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php index 72a1da32c5a..4084f22d847 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +69,10 @@ protected function _prepareCollection() ->addAttributeToSelect('attribute_set_id') ->addAttributeToFilter('type_id', ['in' => $this->getAllowedSelectionTypes()]) ->addFilterByRequiredOptions() - ->addStoreFilter(); + ->addStoreFilter() + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds() + ]); if ($products = $this->_getProducts()) { $collection->addIdFilter($this->_getProducts(), true); @@ -79,8 +83,6 @@ protected function _prepareCollection() $this->setEmptyText($this->__('Please enter search conditions to view products.')); } - Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($collection); - $this->setCollection($collection); return parent::_prepareCollection(); diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php index a8ecf6ea7c6..8d78b76c4f0 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle selection renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method bool getCanEditPrice() * @method $this setCanEditPrice(bool $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..5114cd72f5b 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 @@ -7,30 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { protected $_attributeTabBlock = 'bundle/adminhtml_catalog_product_edit_tab_attributes'; /** - * @return Mage_Adminhtml_Block_Catalog_Product_Edit_Tabs|void + * @return void * @throws Exception */ protected function _prepareLayout() diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php index 74f495a943d..65a9d475fc7 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales order item renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Adminhtml_Sales_Order_Items_Renderer extends Mage_Adminhtml_Block_Sales_Items_Renderer_Default { @@ -55,11 +56,7 @@ public function getChilds($item) } } - if (isset($_itemsArray[$item->getOrderItem()->getId()])) { - return $_itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; - } + return $_itemsArray[$item->getOrderItem()->getId()] ?? null; } /** diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php index 2a6609b427c..0237d6587ef 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales order item renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Adminhtml_Sales_Order_View_Items_Renderer extends Mage_Adminhtml_Block_Sales_Order_View_Items_Renderer_Default { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php index 6a35e0c1927..1bf140dacb3 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product related items block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ - class Mage_Bundle_Block_Catalog_Product_List_Partof extends Mage_Catalog_Block_Product_Abstract { protected $_columnCount = 4; @@ -42,8 +42,10 @@ protected function _prepareData() ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes()) ->addAttributeToSort('position', 'asc') ->addStoreFilter() + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds() + ]) ->addMinimalPrice() - ->joinTable('bundle/option', 'parent_id=entity_id', ['option_id' => 'option_id']) ->joinTable('bundle/selection', 'option_id=option_id', ['product_id' => 'product_id'], '{{table}}.product_id='.$this->getProduct()->getId()); @@ -53,7 +55,6 @@ protected function _prepareData() $collection->addIdFilter(Mage::getSingleton('checkout/cart')->getProductIds(), true); } - Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($collection); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection); $collection->getSelect()->group('entity_id'); diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php index dc8cdd867ab..dac4c190d17 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_Bundle + * @author Magento Core Team * * @method string getMAPTemplate() * @method $this unsWithoutPrice() 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..625ddf3b4b7 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php index 6dec53608ac..7993e5c580f 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,7 +91,7 @@ public function getOptions() /** * Whether the bundle product has any option * - * @return boolean + * @return bool */ public function hasOptions() { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php index ea769b9e719..d6723ff6d5c 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * * @method Mage_Catalog_Model_Product getFormatProduct() * @method $this setFormatProduct(Mage_Catalog_Model_Product $value) diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php index e20dd4a6604..3616717af88 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php index 60c1d8a72e4..6332b87806f 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option multi select type renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php index ed70fdbcaa6..5e0f34559ea 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option radiobox type renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Radio extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php index 3307775aed9..4d21490bec7 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle option dropdown type renderer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Select extends Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option { diff --git a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php index 9b157b683be..c2b9b0a0949 100644 --- a/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart item render block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer { diff --git a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php index 16180033d63..1dd42375a6f 100644 --- a/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +++ b/app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order item render block * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Block_Sales_Order_Items_Renderer extends Mage_Sales_Block_Order_Item_Renderer_Default { @@ -173,11 +174,7 @@ public function getChilds($item) } } - if (isset($_itemsArray[$item->getOrderItem()->getId()])) { - return $_itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; - } + return $_itemsArray[$item->getOrderItem()->getId()] ?? null; } /** diff --git a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php index 06ad8773857..ef35915943c 100644 --- a/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php +++ b/app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Bundle_Helper_Catalog_Product_Configuration extends Mage_Core_Helper_Abstract implements Mage_Catalog_Helper_Product_Configuration_Interface { + protected $_moduleName = 'Mage_Bundle'; + /** * Get selection quantity * @@ -87,9 +90,6 @@ public function getBundleOptions(Mage_Catalog_Model_Product_Configuration_Item_I $optionsQuoteItemOption = $item->getOptionByCode('bundle_option_ids'); $bundleOptionsIds = $optionsQuoteItemOption ? unserialize($optionsQuoteItemOption->getValue(), ['allowed_classes' => false]) : []; if ($bundleOptionsIds) { - /** - * @var Mage_Bundle_Model_Resource_Option_Collection - */ $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $product); // get and add bundle selections collection diff --git a/app/code/core/Mage/Bundle/Helper/Data.php b/app/code/core/Mage/Bundle/Helper/Data.php index fb1c914a2ec..42f965deaed 100644 --- a/app/code/core/Mage/Bundle/Helper/Data.php +++ b/app/code/core/Mage/Bundle/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +27,9 @@ */ class Mage_Bundle_Helper_Data extends Mage_Core_Helper_Abstract { - const XML_NODE_BUNDLE_PRODUCT_TYPE = 'global/catalog/product/type/bundle'; + const XML_NODE_BUNDLE_PRODUCT_TYPE = 'global/catalog/product/type/bundle'; + + protected $_moduleName = 'Mage_Bundle'; /** * Retrieve array of allowed product types for bundle selection product diff --git a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php index 4639f025c6c..c0e86edad8b 100644 --- a/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +31,7 @@ class Mage_Bundle_Model_CatalogIndex_Data_Bundle extends Mage_CatalogIndex_Model /** * Defines when product type has children * - * @var boolean + * @var bool */ protected $_haveChildren = [ Mage_CatalogIndex_Model_Retreiver::CHILDREN_FOR_TIERS=>false, diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php index f59ba7793f7..e2588c92756 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Price.php b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php index 39a03613aa7..e112e2f94d6 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle products Price 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_Price extends Mage_Bundle_Model_Resource_Indexer_Price 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..99196a48b97 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Option.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php index 10fd1c09344..caa0402e8e8 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Option 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_Option extends Mage_Bundle_Model_Resource_Option diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php index 9416aedbf72..7fc9a150d62 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Price/Index.php b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php index da6decb1f21..53f21081c74 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Selection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php index 5a1e47a976a..03cc3686b9c 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Selection 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_Selection extends Mage_Bundle_Model_Resource_Selection diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php index 3db439df5ca..4c07cab14b1 100644 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Observer.php b/app/code/core/Mage/Bundle/Model/Observer.php index c4dbb00a767..34b32ec48f0 100644 --- a/app/code/core/Mage/Bundle/Model/Observer.php +++ b/app/code/core/Mage/Bundle/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Products Observer * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Observer { @@ -87,11 +88,7 @@ public function appendUpsellProducts($observer) $collection = $observer->getEvent()->getCollection(); $limit = $observer->getEvent()->getLimit(); if (is_array($limit)) { - if (isset($limit['upsell'])) { - $limit = $limit['upsell']; - } else { - $limit = 0; - } + $limit = $limit['upsell'] ?? 0; } /** @var Mage_Bundle_Model_Resource_Selection $resource */ @@ -111,7 +108,6 @@ public function appendUpsellProducts($observer) return $this; } - /** @var Mage_Catalog_Model_Resource_Product_Collection $bundleCollection */ $bundleCollection = $product->getCollection() ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes()) ->addStoreFilter() @@ -199,10 +195,13 @@ public function duplicateProduct($observer) /** @var Mage_Catalog_Model_Product $newProduct */ $newProduct = $observer->getEvent()->getNewProduct(); - $product->getTypeInstance(true)->setStoreFilter($product->getStoreId(), $product); - $optionCollection = $product->getTypeInstance(true)->getOptionsCollection($product); - $selectionCollection = $product->getTypeInstance(true)->getSelectionsCollection( - $product->getTypeInstance(true)->getOptionsIds($product), + /** @var Mage_Bundle_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + + $productType->setStoreFilter($product->getStoreId(), $product); + $optionCollection = $productType->getOptionsCollection($product); + $selectionCollection = $productType->getSelectionsCollection( + $productType->getOptionsIds($product), $product ); $optionCollection->appendSelections($selectionCollection); diff --git a/app/code/core/Mage/Bundle/Model/Option.php b/app/code/core/Mage/Bundle/Model/Option.php index af607d20fde..5d3e4bbe78b 100644 --- a/app/code/core/Mage/Bundle/Model/Option.php +++ b/app/code/core/Mage/Bundle/Model/Option.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Option Model * + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team + * * @method Mage_Bundle_Model_Resource_Option _getResource() * @method Mage_Bundle_Model_Resource_Option getResource() * @method Mage_Bundle_Model_Resource_Option_Collection getCollection() @@ -41,10 +46,6 @@ * @method string getTitle() * @method string getType() * @method $this setType(string $value) - * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team */ class Mage_Bundle_Model_Option extends Mage_Core_Model_Abstract { @@ -55,10 +56,6 @@ class Mage_Bundle_Model_Option extends Mage_Core_Model_Abstract */ protected $_defaultSelection = null; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('bundle/option'); diff --git a/app/code/core/Mage/Bundle/Model/Price/Index.php b/app/code/core/Mage/Bundle/Model/Price/Index.php index 717ae1f54db..34c07790da8 100644 --- a/app/code/core/Mage/Bundle/Model/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Price/Index.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,10 +40,6 @@ */ class Mage_Bundle_Model_Price_Index extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('bundle/price_index'); 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..e6bce7cc72c 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -52,8 +53,8 @@ public function getAllOptions() /** * Get a text for option value * - * @param string|integer $value - * @return string + * @param string|int $value + * @return string|false */ public function getOptionText($value) { diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php index c16e3dd83d5..8663534782b 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Price.php +++ b/app/code/core/Mage/Bundle/Model/Product/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Price Model * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Price { @@ -84,8 +85,10 @@ public function getTotalBundleItemsPrice($product, $qty = null) $customOption = $product->getCustomOption('bundle_selection_ids'); if ($customOption) { $selectionIds = unserialize($customOption->getValue(), ['allowed_classes' => false]); + /** @var Mage_Bundle_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); /** @var Mage_Bundle_Model_Resource_Selection_Collection $selections */ - $selections = $product->getTypeInstance(true)->getSelectionsByIds($selectionIds, $product); + $selections = $productType->getSelectionsByIds($selectionIds, $product); $selections->addTierPriceData(); Mage::dispatchEvent('prepare_catalog_product_collection_prices', [ 'collection' => $selections, @@ -468,17 +471,16 @@ public function getMaximalPrice($product) */ public function getOptions($product) { - $product->getTypeInstance(true) - ->setStoreFilter($product->getStoreId(), $product); + /** @var Mage_Bundle_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + $productType->setStoreFilter($product->getStoreId(), $product); - $optionCollection = $product->getTypeInstance(true) - ->getOptionsCollection($product); + $optionCollection = $productType->getOptionsCollection($product); - $selectionCollection = $product->getTypeInstance(true) - ->getSelectionsCollection( - $product->getTypeInstance(true)->getOptionsIds($product), - $product - ); + $selectionCollection = $productType->getSelectionsCollection( + $productType->getOptionsIds($product), + $product + ); return $optionCollection->appendSelections($selectionCollection, false, false); } diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 08eac48abac..e4194d9cefb 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -215,6 +216,7 @@ public function isVirtual($product = null) * Before save type related data * * @param Mage_Catalog_Model_Product $product + * @return $this */ public function beforeSave($product = null) { @@ -257,6 +259,7 @@ public function beforeSave($product = null) } } } + return $this; } /** @@ -604,16 +607,18 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process $product->setOptionsValidationFail(true); $product->getTypeInstance(true)->setStoreFilter($product->getStoreId(), $product); - $optionCollection = $product->getTypeInstance(true)->getOptionsCollection($product); + /** @var Mage_Bundle_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + + $optionCollection = $productType->getOptionsCollection($product); - $optionIds = $product->getTypeInstance(true)->getOptionsIds($product); + $optionIds = $productType->getOptionsIds($product); $selectionIds = []; - $selectionCollection = $product->getTypeInstance(true) - ->getSelectionsCollection( - $optionIds, - $product - ); + $selectionCollection = $productType->getSelectionsCollection( + $optionIds, + $product + ); $options = $optionCollection->appendSelections($selectionCollection, false, $_appendAllSelections); @@ -886,7 +891,7 @@ public function hasOptions($product = null) * Allow for updates of chidren qty's * * @param Mage_Catalog_Model_Product $product - * @return boolean true + * @return bool true */ public function getForceChildItemQtyChanges($product = null) { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php index 7e044652e86..9b5b5b95d53 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Bundle.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Bundle.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php index db820c650f2..84eb2a2da86 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle products Price 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_Price extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Default { 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..b3c828891c8 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 e32bb7b3588..4f4720c95d7 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option.php @@ -7,38 +7,33 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Option 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_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/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php index b035d35554b..52e7e72a7b7 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,6 +27,7 @@ * @author Magento Core Team * * @method Mage_Bundle_Model_Option[] getItems() + * @method Mage_Bundle_Model_Option getItemById($idValue) */ class Mage_Bundle_Model_Resource_Option_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php index ed4aff38f52..80496719dfd 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,9 +49,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'); @@ -394,7 +392,7 @@ public function getProductsSalableStatus($products, Mage_Core_Model_Website $web $query = $read->query($select, $bind); while ($row = $query->fetch()) { - $salable = isset($row['salable']) ? $row['salable'] : true; + $salable = $row['salable'] ?? true; $website = $row['website_id'] > 0; $status = $row['status']; @@ -777,7 +775,7 @@ public function _calculateBundleSelections( $group->getId() ]); - $selectionPrice = isset($priceIndex[$priceIndexKey]) ? $priceIndex[$priceIndexKey] : 0; + $selectionPrice = $priceIndex[$priceIndexKey] ?? 0; $selectionPrice = $this->_calculateSpecialPrice($selectionPrice, $priceData, $website); } else { if ($selection['price_type']) { // percent diff --git a/app/code/core/Mage/Bundle/Model/Resource/Selection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection.php index 25592f4be8a..539024ee971 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Selection 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_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/Resource/Selection/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php index 5bbbd131fa2..e6e14a5c412 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php index 6ad397510f5..f2995af3f28 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +29,7 @@ abstract class Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract extends Mage_Sales_Model_Order_Pdf_Items_Abstract { /** - * Getting all available childs for Invoice, Shipmen or Creditmemo item + * Getting all available children for Invoice, Shipmen or Creditmemo item * * @param Varien_Object $item * @return array @@ -56,11 +57,7 @@ public function getChilds($item) } } - if (isset($_itemsArray[$item->getOrderItem()->getId()])) { - return $_itemsArray[$item->getOrderItem()->getId()]; - } else { - return null; - } + return $_itemsArray[$item->getOrderItem()->getId()] ?? null; } /** diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php index 3f9cdba320f..1cd4df7497c 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Sales Order Creditmemo Pdf default items renderer * * @category Mage - * @package Mage_Sales + * @package Mage_Bundle * @author Magento Core Team */ class Mage_Bundle_Model_Sales_Order_Pdf_Items_Creditmemo extends Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract @@ -186,9 +187,7 @@ public function draw() if ($option['value']) { $text = []; - $_printValue = isset($option['print_value']) - ? $option['print_value'] - : strip_tags($option['value']); + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $values = explode(', ', $_printValue); foreach ($values as $value) { foreach (Mage::helper('core/string')->str_split($value, 30, true, true) as $_value) { diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php index b2388a208bb..8eb5d33447d 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales Order Invoice Pdf default items renderer * * @category Mage - * @package Mage_Sales + * @package Mage_Bundle * @author Magento Core Team */ class Mage_Bundle_Model_Sales_Order_Pdf_Items_Invoice extends Mage_Bundle_Model_Sales_Order_Pdf_Items_Abstract @@ -171,9 +172,7 @@ public function draw() if ($option['value']) { $text = []; - $_printValue = isset($option['print_value']) - ? $option['print_value'] - : strip_tags($option['value']); + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $values = explode(', ', $_printValue); foreach ($values as $value) { foreach ($stringHelper->str_split($value, 30, true, true) as $_value) { 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..7dea6604bb6 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -144,9 +145,7 @@ public function draw() if ($option['value']) { $text = []; - $_printValue = isset($option['print_value']) - ? $option['print_value'] - : strip_tags($option['value']); + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $values = explode(', ', $_printValue); foreach ($values as $value) { foreach (Mage::helper('core/string')->str_split($value, 50, true, true) as $_value) { diff --git a/app/code/core/Mage/Bundle/Model/Selection.php b/app/code/core/Mage/Bundle/Model/Selection.php index 35860562ff0..94cd78097e9 100644 --- a/app/code/core/Mage/Bundle/Model/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Selection.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Bundle Selection Model * + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team + * * @method Mage_Bundle_Model_Resource_Selection _getResource() * @method Mage_Bundle_Model_Resource_Selection getResource() * @method Mage_Bundle_Model_Resource_Selection_Collection getCollection() @@ -50,16 +55,9 @@ * @method $this unsSelectionPriceValue() * @method $this unsSelectionPriceType() * @method bool isSalable() - * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team */ class Mage_Bundle_Model_Selection extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - */ protected function _construct() { $this->_init('bundle/selection'); 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..414153935a8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5c976115ae6 100644 --- a/app/code/core/Mage/Bundle/Model/Source/Option/Type.php +++ b/app/code/core/Mage/Bundle/Model/Source/Option/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php index 8604abfead4..53940f3ac47 100644 --- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php index e101d87f906..742d6609762 100644 --- a/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml selection grid controller * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team */ class Mage_Bundle_Adminhtml_Bundle_SelectionController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Bundle/controllers/Product/EditController.php b/app/code/core/Mage/Bundle/controllers/Product/EditController.php index 90978b14a45..2f633dd194f 100644 --- a/app/code/core/Mage/Bundle/controllers/Product/EditController.php +++ b/app/code/core/Mage/Bundle/controllers/Product/EditController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/controllers/SelectionController.php b/app/code/core/Mage/Bundle/controllers/SelectionController.php index f1fe8050bbf..ec1fe09eedd 100644 --- a/app/code/core/Mage/Bundle/controllers/SelectionController.php +++ b/app/code/core/Mage/Bundle/controllers/SelectionController.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ require_once 'Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php'; @@ -23,12 +23,11 @@ /** * Adminhtml selection grid controller * - * @category Mage - * @package Mage_Bundle - * @author Magento Core Team + * @category Mage + * @package Mage_Bundle + * @author Magento Core Team * @deprecated after 1.4.2.0 Mage_Bundle_Adminhtml_Bundle_SelectionController is used */ class Mage_Bundle_SelectionController extends Mage_Bundle_Adminhtml_Bundle_SelectionController { - } diff --git a/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php index 5e3699b25db..ca7809d71a3 100644 --- a/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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 bbe6e220c26..abcbce0a1ea 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.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_Bundle - * @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_Bundle + * @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/Bundle/sql/bundle_setup/install-1.6.0.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php index 2da3ff1ef11..4291e4ea444 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Bundle - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php index fe24b26c7bd..f6371747714 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php index 8635876648f..9f3b132dc25 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php index 733ca8d3fba..0bbd9de4ebf 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php index 2d8a81e6159..23a44882bdc 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php index b718399072c..267ff72b311 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('bundle/stock_index')}` ( `entity_id` INT(10) UNSIGNED NOT NULL, @@ -32,4 +33,5 @@ PRIMARY KEY (`entity_id`,`stock_id`,`website_id`,`option_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php index 03deff7422a..077ca55968b 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS `{$installer->getTable('catalog/product_index_price')}_bundle`; diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php index 59e8142e029..c2c015f2fde 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->run(" CREATE TABLE {$this->getTable('bundle/selection_price')} ( `selection_id` int(10) unsigned NOT NULL, diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php index 42abb145e33..ae61edafded 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'shipment_type', [ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php index d704094522f..efbad910e2e 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php index 036845b3dc9..6bbf13fdcb8 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_product', 'price_type', 'used_in_product_listing', 1); $installer->endSetup(); diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php index 60ee4b760df..22f71dacb49 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_product', 'price_view', 'used_in_product_listing', 1); $installer->updateAttribute('catalog_product', 'shipment_type', 'used_in_product_listing', 1); diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php index 8b58a7fa505..9956f21e2a4 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('bundle/price_index')}` ( `entity_id` int(10) unsigned NOT NULL, diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php index ee0724042c1..6a235ca0126 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->getConnection()->addKey( $installer->getTable('bundle/option_value'), diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php index 0eb585bce18..f09cc98aa3d 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $attributes = [ diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php index e60044f125e..1f73fa35c8a 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" INSERT IGNORE INTO `{$installer->getTable('catalog/product_relation')}` SELECT @@ -29,4 +30,5 @@ `product_id` FROM `{$installer->getTable('bundle/selection')}`; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 79d8e20bb04..891d6c02bcd 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php index 2250d850655..ba642ea1283 100644 --- a/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installFile = dirname(__FILE__) . DS . 'upgrade-1.6.0.0-1.6.0.0.1.php'; +$installFile = __DIR__ . DS . 'upgrade-1.6.0.0-1.6.0.0.1.php'; if (file_exists($installFile)) { include $installFile; } /** @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; + /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection = $installer->getConnection(); + $memoryTables = [ 'bundle/option_indexer_tmp', 'bundle/selection_indexer_tmp', 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..d40e6e269af 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Bundle + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Captcha/Block/Captcha.php index 10ea9112fec..f5d66944e1c 100644 --- a/app/code/core/Mage/Captcha/Block/Captcha.php +++ b/app/code/core/Mage/Captcha/Block/Captcha.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php index 7e69ae9d3a4..56412d4db5e 100644 --- a/app/code/core/Mage/Captcha/Block/Captcha/Zend.php +++ b/app/code/core/Mage/Captcha/Block/Captcha/Zend.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Captcha/Helper/Data.php b/app/code/core/Mage/Captcha/Helper/Data.php index 622b6a18a5f..7bd0e425e3f 100644 --- a/app/code/core/Mage/Captcha/Helper/Data.php +++ b/app/code/core/Mage/Captcha/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,6 +48,8 @@ class Mage_Captcha_Helper_Data extends Mage_Core_Helper_Abstract */ const XML_PATH_CAPTCHA_FONTS = 'default/captcha/fonts'; + protected $_moduleName = 'Mage_Captcha'; + /** * List uses Models of Captcha * @var array diff --git a/app/code/core/Mage/Captcha/Model/Config/Font.php b/app/code/core/Mage/Captcha/Model/Config/Font.php index d054fb4e8f1..a35a1933f68 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Font.php +++ b/app/code/core/Mage/Captcha/Model/Config/Font.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php b/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php index 1d2299fab38..018c877a9de 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php b/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php index 6ff312c97a2..973f6890113 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Backend.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php b/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php index 6ea1c20885e..e1f10fccd0a 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php +++ b/app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Captcha/Model/Config/Mode.php b/app/code/core/Mage/Captcha/Model/Config/Mode.php index b81cd53cb2d..389eedc93a1 100644 --- a/app/code/core/Mage/Captcha/Model/Config/Mode.php +++ b/app/code/core/Mage/Captcha/Model/Config/Mode.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Captcha/Model/Interface.php b/app/code/core/Mage/Captcha/Model/Interface.php index cce20159797..bcb7139a885 100644 --- a/app/code/core/Mage/Captcha/Model/Interface.php +++ b/app/code/core/Mage/Captcha/Model/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Captcha/Model/Observer.php b/app/code/core/Mage/Captcha/Model/Observer.php index 8cf02c77a29..6f83106d2cd 100644 --- a/app/code/core/Mage/Captcha/Model/Observer.php +++ b/app/code/core/Mage/Captcha/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,7 +61,7 @@ public function checkUserLogin($observer) $captchaModel = Mage::helper('captcha')->getCaptcha($formId); $controller = $observer->getControllerAction(); $loginParams = $controller->getRequest()->getPost('login'); - $login = isset($loginParams['username']) ? $loginParams['username'] : null; + $login = $loginParams['username'] ?? null; if ($captchaModel->isRequired($login)) { $word = $this->_getCaptchaString($controller->getRequest(), $formId); if (!$captchaModel->isCorrect($word)) { @@ -157,7 +158,7 @@ public function checkUserLoginBackend($observer) $formId = 'backend_login'; $captchaModel = Mage::helper('captcha')->getCaptcha($formId); $loginParams = Mage::app()->getRequest()->getPost('login', []); - $login = array_key_exists('username', $loginParams) ? $loginParams['username'] : null; + $login = $loginParams['username'] ?? null; if ($captchaModel->isRequired($login)) { if (!$captchaModel->isCorrect($this->_getCaptchaString(Mage::app()->getRequest(), $formId))) { $captchaModel->logAttempt($login); diff --git a/app/code/core/Mage/Captcha/Model/Resource/Log.php b/app/code/core/Mage/Captcha/Model/Resource/Log.php index 2170c71b851..988421cd43d 100644 --- a/app/code/core/Mage/Captcha/Model/Resource/Log.php +++ b/app/code/core/Mage/Captcha/Model/Resource/Log.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,10 +38,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..2e5c8e20f68 100644 --- a/app/code/core/Mage/Captcha/Model/Zend.php +++ b/app/code/core/Mage/Captcha/Model/Zend.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php index bde8cd96a30..f1b645e5ef9 100644 --- a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Captcha controller * * @category Mage - * @package Mage_Core + * @package Mage_Captcha * @author Magento Core Team */ class Mage_Captcha_Adminhtml_RefreshController extends Mage_Adminhtml_Controller_Action diff --git a/app/code/core/Mage/Captcha/controllers/RefreshController.php b/app/code/core/Mage/Captcha/controllers/RefreshController.php index 391840594f7..47307467858 100644 --- a/app/code/core/Mage/Captcha/controllers/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/RefreshController.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Captcha controller * * @category Mage - * @package Mage_Core + * @package Mage_Captcha * @author Magento Core Team */ class Mage_Captcha_RefreshController extends Mage_Core_Controller_Front_Action diff --git a/app/code/core/Mage/Captcha/etc/config.xml b/app/code/core/Mage/Captcha/etc/config.xml index 2e43aa55be1..3ca8a1ca1a6 100644 --- a/app/code/core/Mage/Captcha/etc/config.xml +++ b/app/code/core/Mage/Captcha/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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..51d972f46d1 100644 --- a/app/code/core/Mage/Captcha/etc/system.xml +++ b/app/code/core/Mage/Captcha/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php b/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php index 56eb3f62e64..667db35b036 100644 --- a/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php +++ b/app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->getConnection() diff --git a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php index 802c52ca089..8ad9a317e02 100644 --- a/app/code/core/Mage/Catalog/Block/Breadcrumbs.php +++ b/app/code/core/Mage/Catalog/Block/Breadcrumbs.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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..75dd57018b8 100644 --- a/app/code/core/Mage/Catalog/Block/Category/View.php +++ b/app/code/core/Mage/Catalog/Block/Category/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Category/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php index 9e689570a6a..4181eb7d9a8 100644 --- a/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Category/Widget/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php index 47fe8d7aadd..a0f37bc2b90 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php index a7be0febae2..2ed8386be1b 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php index 7d3c77fae97..3025d75b7b1 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php index d7fdce3b0ad..bb4343990d6 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php index ce3e42dd43b..39c87b3e5c1 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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/State.php b/app/code/core/Mage/Catalog/Block/Layer/State.php index 2e87ad466c1..827edfee49f 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/State.php +++ b/app/code/core/Mage/Catalog/Block/Layer/State.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..a764e77f3ff 100644 --- a/app/code/core/Mage/Catalog/Block/Layer/View.php +++ b/app/code/core/Mage/Catalog/Block/Layer/View.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Navigation.php b/app/code/core/Mage/Catalog/Block/Navigation.php index 7e597acff49..d1350cf3dff 100644 --- a/app/code/core/Mage/Catalog/Block/Navigation.php +++ b/app/code/core/Mage/Catalog/Block/Navigation.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Navigation extends Mage_Core_Block_Template { @@ -220,12 +221,12 @@ protected function _getItemPosition($level) * * @param Mage_Catalog_Model_Category $category * @param int $level Nesting level number - * @param boolean $isLast Whether ot not this item is last, affects list item class - * @param boolean $isFirst Whether ot not this item is first, affects list item class - * @param boolean $isOutermost Whether ot not this item is outermost, affects list item class + * @param bool $isLast Whether ot not this item is last, affects list item class + * @param bool $isFirst Whether ot not this item is first, affects list item class + * @param bool $isOutermost Whether ot not this item is outermost, affects list item class * @param string $outermostItemClass Extra class of outermost list items * @param string $childrenWrapClass If specified wraps children list in div with this class - * @param boolean $noEventAttributes Whether ot not to add on* attributes to list item + * @param bool $noEventAttributes Whether ot not to add on* attributes to list item * @return string */ protected function _renderCategoryMenuItemHtml( @@ -349,7 +350,7 @@ protected function _renderCategoryMenuItemHtml( * @deprecated deprecated after 1.4 * @param Mage_Catalog_Model_Category $category * @param int $level Nesting level number - * @param boolean $last Whether ot not this item is last, affects list item class + * @param bool $last Whether ot not this item is last, affects list item class * @return string */ public function drawItem($category, $level = 0, $last = false) diff --git a/app/code/core/Mage/Catalog/Block/Product.php b/app/code/core/Mage/Catalog/Block/Product.php index 53b9ca5a83f..ab959f0dcc7 100644 --- a/app/code/core/Mage/Catalog/Block/Product.php +++ b/app/code/core/Mage/Catalog/Block/Product.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + */ class Mage_Catalog_Block_Product extends Mage_Core_Block_Template { protected $_finalPrice = []; diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php index c4d3b2b1969..be1aabe31fa 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -232,7 +233,7 @@ public function _preparePriceRenderer($productType) * Returns product price block html * * @param Mage_Catalog_Model_Product $product - * @param boolean $displayMinimalPrice + * @param bool $displayMinimalPrice * @param string $idSuffix * @return string */ @@ -314,7 +315,7 @@ public function addReviewSummaryTemplate($type, $template) /** * Create reviews summary helper block once * - * @return boolean + * @return bool */ protected function _initReviewsHelperBlock() { @@ -579,7 +580,7 @@ public function removeColumnCountLayoutDepend($pageLayout) * Retrieve row size depends on page layout * * @param string $pageLayout - * @return int|boolean + * @return int|bool */ public function getColumnCountLayoutDepend($pageLayout) { diff --git a/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php index dfdf601815e..62bdae9abfc 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Compare/List.php b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php index cc2ac586c4f..7746f2d5b10 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -205,5 +206,4 @@ public function getAddToWishlistUrlCustom($product, $addFormKey = true) return $helper->getAddUrlWithParams($product, $params); } - } 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..00ed4f26cc5 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +++ b/app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php index 59d83377380..a796e68000d 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php +++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,7 +40,7 @@ protected function _prepareLayout() } /** - * @return mixed + * @return Mage_Catalog_Model_Product */ public function getProduct() { @@ -47,7 +48,7 @@ public function getProduct() } /** - * @return mixed + * @return Varien_Data_Collection */ public function getGalleryCollection() { @@ -55,7 +56,7 @@ public function getGalleryCollection() } /** - * @return null |null + * @return Varien_Object|null * @throws Exception */ public function getCurrentImage() @@ -91,7 +92,7 @@ public function getImageFile() /** * Retrieve image width * - * @return bool|int + * @return false|int */ public function getImageWidth() { @@ -111,7 +112,8 @@ public function getImageWidth() } /** - * @return bool + * @return false|Varien_Object + * @throws Exception */ public function getPreviusImage() { @@ -130,7 +132,8 @@ public function getPreviusImage() } /** - * @return bool + * @return false|Varien_Object + * @throws Exception */ public function getNextImage() { @@ -153,23 +156,23 @@ public function getNextImage() } /** - * @return bool|string + * @return false|string */ public function getPreviusImageUrl() { if ($image = $this->getPreviusImage()) { - return $this->getUrl('*/*/*', ['_current'=>true, 'image'=>$image->getValueId()]); + return $this->getUrl('*/*/*', ['_current' => true, 'image' => $image->getValueId()]); } return false; } /** - * @return bool|string + * @return false|string */ public function getNextImageUrl() { if ($image = $this->getNextImage()) { - return $this->getUrl('*/*/*', ['_current'=>true, 'image'=>$image->getValueId()]); + return $this->getUrl('*/*/*', ['_current' => true, 'image' => $image->getValueId()]); } return false; } diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php index c9a05f7d4a8..d3359346a12 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List.php +++ b/app/code/core/Mage/Catalog/Block/Product/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team * * @method array getAvailableOrders() * @method $this setAvailableOrders(array $value) diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php index 9c8d9fbddbe..451d55c2c72 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Promotion.php b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php index e3d812b26de..65b9ee08fb4 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Promotion.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Product_List_Promotion extends Mage_Catalog_Block_Product_List { diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Random.php b/app/code/core/Mage/Catalog/Block/Product/List/Random.php index d001fc3f897..9e7936943f7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Random.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Random.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Related.php b/app/code/core/Mage/Catalog/Block/Product/List/Related.php index dddde391aff..35e4da0d3fe 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Related.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Related.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Product_List_Related extends Mage_Catalog_Block_Product_Abstract { 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..2530ecf8027 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ef329bb8731 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Upsell.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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 { /** @@ -183,11 +183,7 @@ public function getItemLimit($type = '') if ($type == '') { return $this->_itemLimits; } - if (isset($this->_itemLimits[$type])) { - return $this->_itemLimits[$type]; - } else { - return 0; - } + return $this->_itemLimits[$type] ?? 0; } /** diff --git a/app/code/core/Mage/Catalog/Block/Product/New.php b/app/code/core/Mage/Catalog/Block/Product/New.php index 5526808daff..0fd40a57a04 100644 --- a/app/code/core/Mage/Catalog/Block/Product/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/New.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Price.php b/app/code/core/Mage/Catalog/Block/Product/Price.php index edf2f2b21ad..a3403a29b33 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_Catalog + * @author Magento Core Team * * @method $this setPriceElementIdPrefix(string $value) * @method bool hasRealPriceHtml() @@ -220,7 +222,7 @@ public function getCacheTags() * * If attribute is not found false is returned * - * @param string|integer|Mage_Core_Model_Config_Element $attribute + * @param string|int|Mage_Core_Model_Config_Element $attribute * @return Mage_Eav_Model_Entity_Attribute_Abstract | false */ public function getProductAttribute($attribute) 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..66c0437004b 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Price/Template.php +++ b/app/code/core/Mage/Catalog/Block/Product/Price/Template.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Send.php b/app/code/core/Mage/Catalog/Block/Product/Send.php index 80886add0cc..666a4befedc 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Send.php +++ b/app/code/core/Mage/Catalog/Block/Product/Send.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @module Catalog + * @author Magento Core Team */ class Mage_Catalog_Block_Product_Send extends Mage_Catalog_Block_Product_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..a00ff93f637 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View.php +++ b/app/code/core/Mage/Catalog/Block/Product/View.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php index 1fe51fb1657..5a03b4a524a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Additional.php b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php index bb5a18d0413..18da6ff3986 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Additional.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Additional.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Attributes.php b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php index 3f8652d9db2..d48d885bdc9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Attributes.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Description.php b/app/code/core/Mage/Catalog/Block/Product/View/Description.php index 5acbcde9542..9060ba40cbb 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Description.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Description.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Media.php b/app/code/core/Mage/Catalog/Block/Product/View/Media.php index a7b87f9522b..55c8f4d2221 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Media.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Media.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -33,7 +34,7 @@ class Mage_Catalog_Block_Product_View_Media extends Mage_Catalog_Block_Product_V /** * Flag, that defines whether gallery is disabled * - * @var boolean + * @var bool */ protected $_isGalleryDisabled; @@ -69,7 +70,7 @@ public function getGalleryUrl($image = null) * Retrieve gallery image url * * @param null|Varien_Object $image - * @return string + * @return string|null */ public function getGalleryImageUrl($image) { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php index d98775c6a1c..22a765c733c 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -64,7 +65,7 @@ public function getProduct() /** * Set product object * - * @param Mage_Catalog_Model_Product $product + * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(Mage_Catalog_Model_Product $product = null) @@ -99,11 +100,7 @@ public function addOptionRenderer($type, $block, $template) */ public function getOptionRender($type) { - if (isset($this->_optionRenders[$type])) { - return $this->_optionRenders[$type]; - } - - return $this->_optionRenders['default']; + return $this->_optionRenders[$type] ?? $this->_optionRenders['default']; } /** diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php index 1593f20f56e..c06e13e8157 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,8 +45,8 @@ abstract class Mage_Catalog_Block_Product_View_Options_Abstract extends Mage_Cor /** * Set Product object * - * @param Mage_Catalog_Model_Product $product - * @return Mage_Catalog_Block_Product_View_Options_Abstract + * @param Mage_Catalog_Model_Product|null $product + * @return $this */ public function setProduct(Mage_Catalog_Model_Product $product = null) { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php index 7a1453cfdfb..0bc6526d1e9 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +33,7 @@ class Mage_Catalog_Block_Product_View_Options_Type_Date extends Mage_Catalog_Blo /** * Fill date and time options with leading zeros or not * - * @var boolean + * @var bool */ protected $_fillLeadingZeros = true; @@ -50,7 +51,7 @@ protected function _prepareLayout() /** * Use JS calendar settings * - * @return boolean + * @return bool */ public function useCalendar() { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php index bdee32007aa..641f0c10bad 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php index 37ca5d854eb..6db51c66a97 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php index 21c7e8d566f..c6b10b01f5a 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php index a5dfb733010..e4e0f1214bb 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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/Price.php b/app/code/core/Mage/Catalog/Block/Product/View/Price.php index c9b981b7a3a..ee61f9807e2 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Price.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Block_Product_View_Price extends Mage_Core_Block_Template { 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..2ebb80c8269 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Tabs.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,7 +37,7 @@ class Mage_Catalog_Block_Product_View_Tabs extends Mage_Core_Block_Template * @param string $title * @param string $block * @param string $template - * @return bool + * @return false|void */ public function addTab($alias, $title, $block, $template) { diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php index 25f4850293b..3a7981615c5 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,8 +61,9 @@ protected function _getHelper() */ public function getAllowAttributes() { - return $this->getProduct()->getTypeInstance(true) - ->getConfigurableAttributes($this->getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->getConfigurableAttributes($this->getProduct()); } /** @@ -93,8 +95,9 @@ public function getAllowProducts() if (!$this->hasAllowProducts()) { $products = []; $skipSaleableCheck = Mage::helper('catalog/product')->getSkipSaleableCheck(); - $allProducts = $this->getProduct()->getTypeInstance(true) - ->getUsedProducts(null, $this->getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + $allProducts = $productType->getUsedProducts(null, $this->getProduct()); foreach ($allProducts as $product) { if ($product->isSaleable() || $skipSaleableCheck @@ -220,7 +223,7 @@ public function getJsonConfig() } } /** - * Prepare formated values for options choose + * Prepare formatted values for options choose */ foreach ($optionPrices as $optionPrice) { foreach ($optionPrices as $additional) { @@ -287,7 +290,7 @@ public function getJsonConfig() * @param array $attributeId * @param array $value * @param array $options - * @return boolean + * @return bool */ protected function _validateAttributeValue($attributeId, &$value, &$options) { @@ -302,7 +305,7 @@ protected function _validateAttributeValue($attributeId, &$value, &$options) * Validation of super product option * * @param array $info - * @return boolean + * @return bool */ protected function _validateAttributeInfo(&$info) { @@ -355,7 +358,7 @@ protected function _registerJsPrice($price) * * @deprecated * @param float $price - * @param boolean $round + * @param bool $round * @return float */ protected function _convertPrice($price, $round = false) diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php index dc08d7f4694..721f8f35cd8 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,12 +29,13 @@ class Mage_Catalog_Block_Product_View_Type_Grouped extends Mage_Catalog_Block_Product_View_Abstract { /** - * @return mixed + * @return array */ public function getAssociatedProducts() { - return $this->getProduct()->getTypeInstance(true) - ->getAssociatedProducts($this->getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Grouped $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->getAssociatedProducts($this->getProduct()); } /** 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..369124a4bd9 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..ad1a12736a8 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Block/Product/Widget/Html/Pager.php b/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php index 9d18014f0f8..6326477cd2c 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -168,7 +169,7 @@ public function getTotalNum() /** * Return number of last page * - * @return bool + * @return float|int */ public function getLastPageNum() { diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php index 251aac75747..eaf4b3069ef 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Catalog * @author Magento Core Team */ - class Mage_Catalog_Block_Product_Widget_Link extends Mage_Catalog_Block_Widget_Link { /** diff --git a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php index 4c13b3cb4d4..653d662e7d7 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Widget/New.php +++ b/app/code/core/Mage/Catalog/Block/Product/Widget/New.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php index 5687c38e6e8..3401de0ec4f 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +47,7 @@ public function bindPager($pagerName) /** * Get item URL * - * In most cases should be overriden in descendant blocks + * In most cases should be overridden in descendant blocks * * @param Mage_Catalog_Block_Seo_Sitemap_Abstract $item * @return string diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php index a2fb206f76d..f1660e572f7 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php index cdeb4c2c3e4..3310dfa5ad6 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php @@ -7,29 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SEO Products Sitemap block * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method $this setCollection(Mage_Catalog_Model_Resource_Product_Collection $value) */ class Mage_Catalog_Block_Seo_Sitemap_Product extends Mage_Catalog_Block_Seo_Sitemap_Abstract { - /** * Initialize products collection * @@ -37,18 +37,18 @@ class Mage_Catalog_Block_Seo_Sitemap_Product extends Mage_Catalog_Block_Seo_Site */ protected function _prepareLayout() { - $collection = Mage::getModel('catalog/product')->getCollection(); /** @var Mage_Catalog_Model_Resource_Product_Collection $collection */ - - $collection->addAttributeToSelect('name'); - $collection->addAttributeToSelect('url_key'); - $collection->addStoreFilter(); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + $collection = Mage::getModel('catalog/product')->getCollection(); + $collection + ->addAttributeToSelect('name') + ->addAttributeToSelect('url_key') + ->addStoreFilter() + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getVisibleStatusIds() + ]); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection); $this->setCollection($collection); - return $this; } diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php index b63c17830fa..6206c573175 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -161,8 +162,8 @@ protected function _prepareCollection() * Return level of indent * * @param Mage_Catalog_Model_Category $item - * @param integer $delta - * @return integer + * @param int $delta + * @return int */ public function getLevel($item, $delta = 1) { diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php index c707064a69f..82bcd590499 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Html page block * * @category Mage - * @package Mage_Page - * @author Magento Core Team - * - * @todo separate order, mode and pager + * @package Mage_Catalog + * @author Magento Core Team + * @todo Separate order, mode and pager */ class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pager { @@ -37,7 +37,7 @@ class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pag /** * @param int $displacement - * @return int|mixed + * @return int * @throws Exception */ public function getCurrentPage($displacement = 0) diff --git a/app/code/core/Mage/Catalog/Block/Widget/Link.php b/app/code/core/Mage/Catalog/Block/Widget/Link.php index 19a3243043d..a6d1288d646 100644 --- a/app/code/core/Mage/Catalog/Block/Widget/Link.php +++ b/app/code/core/Mage/Catalog/Block/Widget/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -72,7 +73,7 @@ public function getHref() /** @var Mage_Catalog_Helper_Product $helper */ $helper = $this->_getFactory()->getHelper('catalog/product'); $productId = $idPath[1]; - $categoryId = isset($idPath[2]) ? $idPath[2] : null; + $categoryId = $idPath[2] ?? null; $this->_href = $helper->getFullProductUrl($productId, $categoryId); } elseif (isset($idPath[0]) && isset($idPath[1]) && $idPath[0] == 'category') { diff --git a/app/code/core/Mage/Catalog/Exception.php b/app/code/core/Mage/Catalog/Exception.php index 8029e7bfcbf..ad3c5597288 100644 --- a/app/code/core/Mage/Catalog/Exception.php +++ b/app/code/core/Mage/Catalog/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php index 68037b36b1a..058d65421ad 100644 --- a/app/code/core/Mage/Catalog/Helper/Category.php +++ b/app/code/core/Mage/Catalog/Helper/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,6 +32,8 @@ class Mage_Catalog_Helper_Category extends Mage_Core_Helper_Abstract const XML_PATH_USE_CATEGORY_CANONICAL_TAG = 'catalog/seo/category_canonical_tag'; const XML_PATH_CATEGORY_ROOT_ID = 'catalog/category/root_id'; + protected $_moduleName = 'Mage_Catalog'; + /** * Store categories cache * @@ -48,8 +51,8 @@ class Mage_Catalog_Helper_Category extends Mage_Core_Helper_Abstract /** * Retrieve current store categories * - * @param boolean|string $sorted - * @param boolean $asCollection + * @param bool|string $sorted + * @param bool $asCollection * @param bool $toLoad * @return array|Mage_Catalog_Model_Resource_Category_Collection|Varien_Data_Collection|Varien_Data_Tree_Node_Collection * @throws Mage_Core_Model_Store_Exception @@ -101,7 +104,7 @@ public function getCategoryUrl($category) * Check if a category can be shown * * @param Mage_Catalog_Model_Category|int $category - * @return boolean + * @return bool */ public function canShow($category) { diff --git a/app/code/core/Mage/Catalog/Helper/Category/Flat.php b/app/code/core/Mage/Catalog/Helper/Category/Flat.php index f0eb9e2affc..08c13cd8951 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Flat.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php index 0e2cc21dd5b..fb538692df1 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Category url rewrite helper * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Helper_Category_Url_Rewrite implements Mage_Catalog_Helper_Category_Url_Rewrite_Interface { diff --git a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php index 3dd22f72cf1..66ba6919f45 100644 --- a/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Category url rewrite interface * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ interface Mage_Catalog_Helper_Category_Url_Rewrite_Interface { diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php index 831aa010ce8..575fe499271 100644 --- a/app/code/core/Mage/Catalog/Helper/Data.php +++ b/app/code/core/Mage/Catalog/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,6 +46,8 @@ class Mage_Catalog_Helper_Data extends Mage_Core_Helper_Abstract const XML_PATH_MSRP_EXPLANATION_MESSAGE = 'sales/msrp/explanation_message'; const XML_PATH_MSRP_EXPLANATION_MESSAGE_WHATS_THIS = 'sales/msrp/explanation_message_whats_this'; + protected $_moduleName = 'Mage_Catalog'; + /** * Breadcrumb Path cache * diff --git a/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php b/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php index 2a6577613de..3811973c64b 100644 --- a/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php +++ b/app/code/core/Mage/Catalog/Helper/Flat/Abstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index 554cffa9416..3e4a9e028d8 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,6 +32,8 @@ class Mage_Catalog_Helper_Image extends Mage_Core_Helper_Abstract const XML_NODE_PRODUCT_SMALL_IMAGE_WIDTH = 'catalog/product_image/small_width'; const XML_NODE_PRODUCT_MAX_DIMENSION = 'catalog/product_image/max_dimension'; + protected $_moduleName = 'Mage_Catalog'; + /** * Current model * diff --git a/app/code/core/Mage/Catalog/Helper/Map.php b/app/code/core/Mage/Catalog/Helper/Map.php index 1e69e5cb042..b8a4cdafd8e 100644 --- a/app/code/core/Mage/Catalog/Helper/Map.php +++ b/app/code/core/Mage/Catalog/Helper/Map.php @@ -7,24 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog (site)map helper + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Helper_Map extends Mage_Core_Helper_Abstract { const XML_PATH_USE_TREE_MODE = 'catalog/sitemap/tree_mode'; + protected $_moduleName = 'Mage_Catalog'; + /** * @return string */ @@ -44,7 +51,7 @@ public function getProductUrl() /** * Return true if category tree mode enabled * - * @return boolean + * @return bool */ public function getIsUseCategoryTreeMode() { diff --git a/app/code/core/Mage/Catalog/Helper/Output.php b/app/code/core/Mage/Catalog/Helper/Output.php index 180e802eedc..78d6c838b49 100644 --- a/app/code/core/Mage/Catalog/Helper/Output.php +++ b/app/code/core/Mage/Catalog/Helper/Output.php @@ -7,19 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + */ class Mage_Catalog_Helper_Output extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Catalog'; + /** * Array of existing handlers * @@ -34,9 +42,6 @@ class Mage_Catalog_Helper_Output extends Mage_Core_Helper_Abstract */ protected $_templateProcessor = null; - /** - * Constructor - */ public function __construct() { Mage::dispatchEvent('catalog_helper_output_construct', ['helper'=>$this]); @@ -85,7 +90,7 @@ public function addHandler($method, $handler) public function getHandlers($method) { $method = strtolower($method); - return isset($this->_handlers[$method]) ? $this->_handlers[$method] : []; + return $this->_handlers[$method] ?? []; } /** diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php index 478e73bd4e8..ff4b822cc41 100644 --- a/app/code/core/Mage/Catalog/Helper/Product.php +++ b/app/code/core/Mage/Catalog/Helper/Product.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 extends Mage_Core_Helper_Url { @@ -31,10 +34,12 @@ class Mage_Catalog_Helper_Product extends Mage_Core_Helper_Url const DEFAULT_QTY = 1; + protected $_moduleName = 'Mage_Catalog'; + /** * Flag that shows if Magento has to check product to be saleable (enabled and/or inStock) * - * @var boolean + * @var bool */ protected $_skipSaleableCheck = false; @@ -53,7 +58,7 @@ class Mage_Catalog_Helper_Product extends Mage_Core_Helper_Url * Retrieve product view page url * * @param Mage_Catalog_Model_Product|string|int $product - * @return string + * @return string|false */ public function getProductUrl($product) { @@ -188,7 +193,7 @@ public function getStatuses() * * @param Mage_Catalog_Model_Product|int $product * @param string $where - * @return boolean + * @return bool */ public function canShow($product, $where = 'catalog') { @@ -489,7 +494,7 @@ public function setSkipSaleableCheck($skipSaleableCheck = false) /** * Get flag that shows if Magento has to check product to be saleable (enabled and/or inStock) * - * @return boolean + * @return bool */ public function getSkipSaleableCheck() { diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index 9523b46b872..a0297d01795 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Catalog_Helper_Product_Compare extends Mage_Core_Helper_Url { + protected $_moduleName = 'Mage_Catalog'; + /** * Product Compare Items Collection * @@ -91,18 +94,12 @@ class Mage_Catalog_Helper_Product_Compare extends Mage_Core_Helper_Url */ public function __construct(array $data = []) { - $this->_logCondition = isset($data['log_condition']) - ? $data['log_condition'] : Mage::helper('log'); - $this->_catalogSession = isset($data['catalog_session']) - ? $data['catalog_session'] : Mage::getSingleton('catalog/session'); - $this->_customerSession = isset($data['customer_session']) - ? $data['customer_session'] : Mage::getSingleton('customer/session'); - $this->_coreSession = isset($data['core_session']) - ? $data['core_session'] : Mage::getSingleton('core/session'); - $this->_productVisibility = isset($data['product_visibility']) - ? $data['product_visibility'] : Mage::getSingleton('catalog/product_visibility'); - $this->_logVisitor = isset($data['log_visitor']) - ? $data['log_visitor'] : Mage::getSingleton('log/visitor'); + $this->_logCondition = $data['log_condition'] ?? Mage::helper('log'); + $this->_catalogSession = $data['catalog_session'] ?? Mage::getSingleton('catalog/session'); + $this->_customerSession = $data['customer_session'] ?? Mage::getSingleton('customer/session'); + $this->_coreSession = $data['core_session'] ?? Mage::getSingleton('core/session'); + $this->_productVisibility = $data['product_visibility'] ?? Mage::getSingleton('catalog/product_visibility'); + $this->_logVisitor = $data['log_visitor'] ?? Mage::getSingleton('log/visitor'); } /** diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php index 1d3ba0e75a5..b3b05ee9e53 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Catalog_Helper_Product_Configuration extends Mage_Core_Helper_Abstrac { const XML_PATH_CONFIGURABLE_ALLOWED_TYPES = 'global/catalog/product/type/configurable/allow_product_types'; + protected $_moduleName = 'Mage_Catalog'; + /** * Retrieves product configuration options * @@ -98,8 +101,9 @@ public function getConfigurableOptions(Mage_Catalog_Model_Product_Configuration_ if ($typeId != Mage_Catalog_Model_Product_Type_Configurable::TYPE_CODE) { Mage::throwException($this->__('Wrong product type to extract configurable options.')); } - $attributes = $product->getTypeInstance(true) - ->getSelectedAttributesInfo($product); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $attributes = $productType->getSelectedAttributesInfo($product); return array_merge($attributes, $this->getCustomOptions($item)); } @@ -118,9 +122,7 @@ public function getGroupedOptions(Mage_Catalog_Model_Product_Configuration_Item_ } $options = []; - /** - * @var Mage_Catalog_Model_Product_Type_Grouped - */ + /** @var Mage_Catalog_Model_Product_Type_Grouped $typeInstance */ $typeInstance = $product->getTypeInstance(true); $associatedProducts = $typeInstance->getAssociatedProducts($product); @@ -197,8 +199,8 @@ public function getFormattedOptionValue($optionValue, $params = null) if (!$params) { $params = []; } - $maxLength = isset($params['max_length']) ? $params['max_length'] : null; - $cutReplacer = isset($params['cut_replacer']) ? $params['cut_replacer'] : '...'; + $maxLength = $params['max_length'] ?? null; + $cutReplacer = $params['cut_replacer'] ?? '...'; // Proceed with option $optionInfo = []; diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php index 2c217b7688b..31847fb9244 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php index 668acde638e..eb4c1a462ff 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,6 +45,8 @@ class Mage_Catalog_Helper_Product_Flat extends Mage_Catalog_Helper_Flat_Abstract */ const CATALOG_FLAT_PROCESS_CODE = 'catalog_product_flat'; + protected $_moduleName = 'Mage_Catalog'; + /** * Catalog Product Flat index process code * @@ -79,14 +82,14 @@ class Mage_Catalog_Helper_Product_Flat extends Mage_Catalog_Helper_Flat_Abstract * to force EAV for products in quote * store settings will be used by default * - * @var boolean + * @var bool */ protected $_forceFlatStatus = false; /** * Old Catalog Product Flat forced status * - * @var boolean + * @var bool */ protected $_forceFlatStatusOld; diff --git a/app/code/core/Mage/Catalog/Helper/Product/Options.php b/app/code/core/Mage/Catalog/Helper/Product/Options.php index 56c3e59c1c6..f4a5e33f661 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Options.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,8 @@ */ class Mage_Catalog_Helper_Product_Options extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Catalog'; + /** * Fetches and outputs file to user browser * $info is array with following indexes: diff --git a/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php b/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php index 736c133ea59..34e35251c3a 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Catalog_Helper_Product_Type_Composite extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Catalog'; + /** * Calculation real price * @@ -78,7 +81,7 @@ public function registerJsPrice($price) * Convert price from default currency to current currency * * @param float $price - * @param boolean $round + * @param bool $round * @param null|int $storeId * @return float */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url.php b/app/code/core/Mage/Catalog/Helper/Product/Url.php index f6002fd2f2f..c860954f234 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,8 @@ */ class Mage_Catalog_Helper_Product_Url extends Mage_Core_Helper_Url { + protected $_moduleName = 'Mage_Catalog'; + /** * Symbol convert table * diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php index 560e5f5ddd8..6686bad9bbe 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product url rewrite helper * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Helper_Product_Url_Rewrite implements Mage_Catalog_Helper_Product_Url_Rewrite_Interface { diff --git a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php index 3b7ecc93d5f..b490b9263fd 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product url rewrite interface * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ interface Mage_Catalog_Helper_Product_Url_Rewrite_Interface { diff --git a/app/code/core/Mage/Catalog/Helper/Product/View.php b/app/code/core/Mage/Catalog/Helper/Product/View.php index 1959906f982..ddc7582aae5 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/View.php +++ b/app/code/core/Mage/Catalog/Helper/Product/View.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -29,6 +32,8 @@ class Mage_Catalog_Helper_Product_View extends Mage_Core_Helper_Abstract public $ERR_NO_PRODUCT_LOADED = 1; public $ERR_BAD_CONTROLLER_INTERFACE = 2; + protected $_moduleName = 'Mage_Catalog'; + /** * Inits layout for viewing product page * diff --git a/app/code/core/Mage/Catalog/Model/Abstract.php b/app/code/core/Mage/Catalog/Model/Abstract.php index 17658dcf431..cefebec1e1c 100644 --- a/app/code/core/Mage/Catalog/Model/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +31,7 @@ abstract class Mage_Catalog_Model_Abstract extends Mage_Core_Model_Abstract { /** - * Identifuer of default store + * Identifier of default store * used for loading default data for entity */ const DEFAULT_STORE_ID = 0; @@ -60,16 +61,16 @@ abstract class Mage_Catalog_Model_Abstract extends Mage_Core_Model_Abstract protected $_lockedAttributes = []; /** - * Is model deleteable + * Is model deletable * - * @var boolean + * @var bool */ protected $_isDeleteable = true; /** * Is model readonly * - * @var boolean + * @var bool */ protected $_isReadonly = false; @@ -124,7 +125,7 @@ public function getLockedAttributes() /** * Checks that model have locked attributes * - * @return boolean + * @return bool */ public function hasLockedAttributes() { @@ -135,7 +136,7 @@ public function hasLockedAttributes() * Retrieve locked attributes * * @param string $attributeCode - * @return boolean + * @return bool */ public function isLockedAttribute($attributeCode) { @@ -308,7 +309,7 @@ protected function _beforeSave() /** * Checks model is deletable * - * @return boolean + * @return bool */ public function isDeleteable() { @@ -318,7 +319,7 @@ public function isDeleteable() /** * Set is deletable flag * - * @param boolean $value + * @param bool $value * @return $this */ public function setIsDeleteable($value) @@ -330,7 +331,7 @@ public function setIsDeleteable($value) /** * Checks model is deletable * - * @return boolean + * @return bool */ public function isReadonly() { @@ -340,7 +341,7 @@ public function isReadonly() /** * Set is deletable flag * - * @param boolean $value + * @param bool $value * @return $this */ public function setIsReadonly($value) diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php index 01422581263..0a98c409fa8 100644 --- a/app/code/core/Mage/Catalog/Model/Api/Resource.php +++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -58,7 +59,7 @@ class Mage_Catalog_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract * * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param array $attributes - * @return boolean + * @return bool */ protected function _isAllowedAttribute($attribute, $attributes = null) { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php index e848e1564e7..347af285458 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php index 6000948d7ee..406cc1fc6cd 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php index f93a39e3d99..8c7b5ee03e5 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php index a6236759a72..37161525cf8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ef30f0f5802 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..e84b091f032 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php index 3e4d57a4e5c..8fba0db4b83 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php index 825594885a5..c119762153b 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..22eb73e8fa0 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +33,7 @@ class Mage_Catalog_Model_Api2_Product_Image_Rest_Admin_V1 extends Mage_Catalog_M * * @throws Mage_Api2_Exception * @param array $data - * @return string + * @return string|void */ protected function _create(array $data) { @@ -197,7 +198,6 @@ protected function _delete() /** * Retrieve product images data * - * @throws Mage_Api2_Exception * @return array */ protected function _retrieveCollection() 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..a8bc8e4dc0b 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..f4e30aa38cb 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php index 1dc148f62be..11030c6df05 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php index 9ead8f6c7c6..f5223168519 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..84132dbd0f8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -382,7 +383,7 @@ protected function _filterConfigValueUsed(&$data, $fields) * * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param array $attributes - * @return boolean + * @return bool */ protected function _isAllowedAttribute($attribute, $attributes = null) { 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..59bd41a4403 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..2e4b069be3c 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Validator/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php index bca28f1885e..8165cfef789 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -233,7 +234,7 @@ protected function _validateAttributes($data, $productEntity) * Validate product type * * @param array $data - * @return bool + * @return true|void */ protected function _validateProductType($data) { @@ -253,7 +254,7 @@ protected function _validateProductType($data) * * @param array $data * @param Mage_Eav_Model_Entity_Type $productEntity - * @return bool + * @return true|void */ protected function _validateAttributeSet($data, $productEntity) { @@ -274,7 +275,7 @@ protected function _validateAttributeSet($data, $productEntity) * Validate SKU * * @param array $data - * @return bool + * @return true|void */ protected function _validateSku($data) { 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..6d253e63baf 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php index f523aa282b8..48c8372dba2 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -119,7 +120,7 @@ protected function _multiCreate(array $data) if (!$validator->isValidDataForWebsiteAssignmentToProduct($product, $singleData)) { foreach ($validator->getErrors() as $error) { $this->_errorMessage($error, Mage_Api2_Model_Server::HTTP_BAD_REQUEST, [ - 'website_id' => isset($singleData['website_id']) ? $singleData['website_id'] : null, + 'website_id' => $singleData['website_id'] ?? null, 'product_id' => $product->getId(), ]); } @@ -161,7 +162,7 @@ protected function _multiCreate(array $data) $e->getMessage(), $e->getCode(), [ - 'website_id' => isset($singleData['website_id']) ? $singleData['website_id'] : null, + 'website_id' => $singleData['website_id'] ?? null, 'product_id' => $product->getId(), ] ); @@ -171,7 +172,7 @@ protected function _multiCreate(array $data) Mage_Api2_Model_Resource::RESOURCE_INTERNAL_ERROR, Mage_Api2_Model_Server::HTTP_INTERNAL_ERROR, [ - 'website_id' => isset($singleData['website_id']) ? $singleData['website_id'] : null, + 'website_id' => $singleData['website_id'] ?? null, 'product_id' => $product->getId(), ] ); 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..43c684bc596 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..bef2bde2a28 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php index b2ca9727c4c..a406de9e563 100644 --- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php +++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php index 48073f3c992..bd06b258ce4 100644 --- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Catalog/Model/Category.php index d68ea7bf64f..de0dfd70420 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -156,7 +157,7 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract /** * Category tree model * - * @var Mage_Catalog_Model_Resource_Category_Tree. + * @var Mage_Catalog_Model_Resource_Category_Tree */ protected $_treeModel = null; @@ -222,7 +223,7 @@ public function getTreeModel() } /** - * @return Mage_Catalog_Model_Resource_Category_Tree. + * @return Mage_Catalog_Model_Resource_Category_Tree */ public function getTreeModelInstance() { @@ -448,7 +449,7 @@ public function getLayoutUpdateHandle() * * If store id is underfined for category return current active store id * - * @return integer + * @return int */ public function getStoreId() { @@ -649,7 +650,7 @@ private function _getAttribute($attributeCode) /** * Get all children categories IDs * - * @param boolean $asArray return result as array instead of comma-separated list of IDs + * @param bool $asArray return result as array instead of comma-separated list of IDs * @return array|string */ public function getAllChildren($asArray = false) @@ -841,7 +842,7 @@ public function getProductCount() * @param bool $sorted * @param bool $asCollection * @param bool $toLoad - * @return mixed + * @return array|Mage_Catalog_Model_Resource_Category_Collection|Varien_Data_Collection|Varien_Data_Tree_Node_Collection */ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true) { diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php index 571ffac125c..17ae6c415f4 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +60,7 @@ public function level($website = null, $store = null, $categoryId = null) } } elseif (in_array($store, $website->getStoreIds())) { $storeId = Mage::app()->getStore($store); - $ids = ($categoryId === null)? $store->getRootCategoryId() : $categoryId; + $ids = $categoryId ?? $store->getRootCategoryId(); } else { $this->_fault('store_not_exists'); } @@ -83,7 +84,7 @@ public function level($website = null, $store = null, $categoryId = null) } } // load all root categories else { - $ids = ($categoryId === null)? Mage_Catalog_Model_Category::TREE_ROOT_ID : $categoryId; + $ids = $categoryId ?? Mage_Catalog_Model_Category::TREE_ROOT_ID; } $collection = Mage::getModel('catalog/category')->getCollection() @@ -304,7 +305,7 @@ public function create($parentId, $categoryData, $store = null) * @param int $categoryId * @param array $categoryData * @param string|int $store - * @return boolean + * @return bool */ public function update($categoryId, $categoryData, $store = null) { @@ -348,7 +349,7 @@ public function update($categoryId, $categoryData, $store = null) * @param int $categoryId * @param int $parentId * @param int $afterId - * @return boolean + * @return bool */ public function move($categoryId, $parentId, $afterId = null) { @@ -378,7 +379,7 @@ public function move($categoryId, $parentId, $afterId = null) * Delete category * * @param int $categoryId - * @return boolean + * @return bool */ public function delete($categoryId) { @@ -453,7 +454,7 @@ public function assignedProducts($categoryId, $store = null) * @param int $productId * @param int $position * @param null|string $identifierType Should be 'sku' when working with SKU's. Leave null when using ID's - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function assignProduct($categoryId, $productId, $position = null, $identifierType = null) @@ -480,7 +481,7 @@ public function assignProduct($categoryId, $productId, $position = null, $identi * @param int $productId * @param int $position * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function updateProduct($categoryId, $productId, $position = null, $identifierType = null) @@ -509,7 +510,7 @@ public function updateProduct($categoryId, $productId, $position = null, $identi * @param int $categoryId * @param int $productId * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function removeProduct($categoryId, $productId, $identifierType = null) 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..5b94de8a868 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -118,7 +119,7 @@ public function create($parentId, $categoryData, $store = null) * @param int $categoryId * @param array $categoryData * @param string|int $store - * @return boolean + * @return bool */ public function update($categoryId, $categoryData, $store = null) { diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php index 06357ef8818..3fc96fad801 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..73ce9925fc2 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index f270a9e9d7c..c5e793c2b16 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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..3a3b0168f97 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..b864accd128 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +28,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/Layout.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php index d8b5761049f..677a28959f2 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Model_Category_Attribute_Source_Layout extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php index c8b1e8832db..201a71be108 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Model_Category_Attribute_Source_Mode extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php index eb48999576f..a06679a5191 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Model_Category_Attribute_Source_Page extends Mage_Eav_Model_Entity_Attribute_Source_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..93093a41cec 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php index 41c4f251516..1f649261cfa 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php index 41fe86c518b..4e785a1719c 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,6 +27,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 * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Category_Indexer_Product _getResource() * @method Mage_Catalog_Model_Resource_Category_Indexer_Product getResource() * @method int getCategoryId() @@ -40,10 +45,6 @@ * @method Mage_Catalog_Model_Category_Indexer_Product setStoreId(int $value) * @method int getVisibility() * @method Mage_Catalog_Model_Category_Indexer_Product setVisibility(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Category_Indexer_Product extends Mage_Index_Model_Indexer_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Category/Url.php b/app/code/core/Mage/Catalog/Model/Category/Url.php index cc492ab2686..7872a69af06 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Url.php +++ b/app/code/core/Mage/Catalog/Model/Category/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Config.php b/app/code/core/Mage/Catalog/Model/Config.php index 59115aa1b2e..81c28fa0de8 100644 --- a/app/code/core/Mage/Catalog/Model/Config.php +++ b/app/code/core/Mage/Catalog/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -64,19 +65,13 @@ class Mage_Catalog_Model_Config extends Mage_Eav_Model_Config const XML_PATH_PRODUCT_COLLECTION_ATTRIBUTES = 'frontend/product/collection/attributes'; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('catalog/config'); } /** - * Set store id - * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -88,14 +83,11 @@ public function setStoreId($storeId) /** * Return store id, if is not set return current app store * - * @return integer + * @return int */ public function getStoreId() { - if ($this->_storeId === null) { - return Mage::app()->getStore()->getId(); - } - return $this->_storeId; + return $this->_storeId ?? Mage::app()->getStore()->getId(); } /** @@ -136,7 +128,7 @@ public function getAttributeSetName($entityTypeId, $id) if (!is_numeric($entityTypeId)) { $entityTypeId = $this->getEntityType($entityTypeId)->getId(); } - return isset($this->_attributeSetsById[$entityTypeId][$id]) ? $this->_attributeSetsById[$entityTypeId][$id] : false; + return $this->_attributeSetsById[$entityTypeId][$id] ?? false; } /** @@ -155,7 +147,7 @@ public function getAttributeSetId($entityTypeId, $name) $entityTypeId = $this->getEntityType($entityTypeId)->getId(); } $name = strtolower($name); - return isset($this->_attributeSetsByName[$entityTypeId][$name]) ? $this->_attributeSetsByName[$entityTypeId][$name] : false; + return $this->_attributeSetsByName[$entityTypeId][$name] ?? false; } /** @@ -197,7 +189,7 @@ public function getAttributeGroupName($attributeSetId, $id) if (!is_numeric($attributeSetId)) { $attributeSetId = $this->getAttributeSetId($attributeSetId); } - return isset($this->_attributeGroupsById[$attributeSetId][$id]) ? $this->_attributeGroupsById[$attributeSetId][$id] : false; + return $this->_attributeGroupsById[$attributeSetId][$id] ?? false; } /** @@ -217,7 +209,7 @@ public function getAttributeGroupId($attributeSetId, $name) $attributeSetId = $this->getAttributeSetId($attributeSetId); } $name = strtolower($name); - return isset($this->_attributeGroupsByName[$attributeSetId][$name]) ? $this->_attributeGroupsByName[$attributeSetId][$name] : false; + return $this->_attributeGroupsByName[$attributeSetId][$name] ?? false; } /** @@ -260,7 +252,7 @@ public function getProductTypeId($name) $this->loadProductTypes(); $name = strtolower($name); - return isset($this->_productTypesByName[$name]) ? $this->_productTypesByName[$name] : false; + return $this->_productTypesByName[$name] ?? false; } /** @@ -275,7 +267,7 @@ public function getProductTypeName($id) $this->loadProductTypes(); - return isset($this->_productTypesById[$id]) ? $this->_productTypesById[$id] : false; + return $this->_productTypesById[$id] ?? false; } /** diff --git a/app/code/core/Mage/Catalog/Model/Convert.php b/app/code/core/Mage/Catalog/Model/Convert.php index bcb7b21bcdf..704fbfa712c 100644 --- a/app/code/core/Mage/Catalog/Model/Convert.php +++ b/app/code/core/Mage/Catalog/Model/Convert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Catalog_Model_Convert extends Mage_Core_Model_Convert diff --git a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php index b0de13b070a..00f47590ef6 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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 1441b0d000c..9a539d5f9f0 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Catalog_Model_Convert_Adapter_Product * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @property string $_storesIdCode */ class Mage_Catalog_Model_Convert_Adapter_Product extends Mage_Eav_Model_Convert_Adapter_Entity @@ -28,11 +33,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'; /** @@ -338,11 +338,7 @@ public function getStoreByCode($store) return Mage::app()->getStore(Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID); } - if (isset($this->_stores[$store])) { - return $this->_stores[$store]; - } - - return false; + return $this->_stores[$store] ?? false; } /** @@ -682,7 +678,7 @@ public function saveRow(array $importData) * Check product define type */ if (empty($importData['type']) || !isset($productTypes[strtolower($importData['type'])])) { - $value = isset($importData['type']) ? $importData['type'] : ''; + $value = $importData['type'] ?? ''; $message = Mage::helper('catalog')->__('Skip import row, is not valid value "%s" for field "%s"', $value, 'type'); Mage::throwException($message); } @@ -691,7 +687,7 @@ public function saveRow(array $importData) * Check product define attribute set */ if (empty($importData['attribute_set']) || !isset($productAttributeSets[$importData['attribute_set']])) { - $value = isset($importData['attribute_set']) ? $importData['attribute_set'] : ''; + $value = $importData['attribute_set'] ?? ''; $message = Mage::helper('catalog')->__('Skip import row, the value "%s" is invalid for field "%s"', $value, 'attribute_set'); Mage::throwException($message); } @@ -813,9 +809,7 @@ public function saveRow(array $importData) } $stockData = []; - $inventoryFields = isset($this->_inventoryFieldsProductTypes[$product->getTypeId()]) - ? $this->_inventoryFieldsProductTypes[$product->getTypeId()] - : []; + $inventoryFields = $this->_inventoryFieldsProductTypes[$product->getTypeId()] ?? []; foreach ($inventoryFields as $field) { if (isset($importData[$field])) { if (in_array($field, $this->_toNumber)) { diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php index 9f88ca4d85a..9bc565fbfec 100644 --- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Catalog_Model_Convert_Parser_Product + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Convert_Parser_Product extends Mage_Eav_Model_Convert_Parser_Abstract { @@ -141,17 +146,14 @@ public function getProductTypes() public function getProductTypeName($code) { $productTypes = $this->getProductTypes(); - if (isset($productTypes[$code])) { - return $productTypes[$code]; - } - return false; + return $productTypes[$code] ?? false; } /** * Retrieve product type code by name * * @param string $name - * @return string + * @return string|false */ public function getProductTypeId($name) { @@ -313,7 +315,7 @@ public function parse() } // get store ids - $storeIds = $this->getStoreIds(isset($row['store']) ? $row['store'] : $this->getVar('store')); + $storeIds = $this->getStoreIds($row['store'] ?? $this->getVar('store')); if (!$storeIds) { $this->addException( Mage::helper('catalog')->__('Invalid store specified, skipping the record.'), diff --git a/app/code/core/Mage/Catalog/Model/Design.php b/app/code/core/Mage/Catalog/Model/Design.php index d45d49c7407..96937f996a1 100644 --- a/app/code/core/Mage/Catalog/Model/Design.php +++ b/app/code/core/Mage/Catalog/Model/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php index e1d860c12ca..a03ce31ec8e 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Attribute.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php index cfe23c4eaee..b3085e97109 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Entity/Attribute/Model - select product design options container from config * * @category Mage - * @package Mage_Eav + * @package Mage_Catalog * @author Magento Core Team */ class Mage_Catalog_Model_Entity_Product_Attribute_Design_Options_Container extends Mage_Eav_Model_Entity_Attribute_Source_Config @@ -37,7 +38,7 @@ public function __construct() /** * Get a text for option value * - * @param string|integer $value + * @param string|int $value * @return string|false */ public function getOptionText($value) @@ -50,9 +51,6 @@ public function getOptionText($value) } } } - if (isset($options[$value])) { - return $options[$value]; - } - return false; + return $options[$value] ?? false; } } diff --git a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php index 5ca7e68b86a..35d74212ddb 100644 --- a/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Factory.php b/app/code/core/Mage/Catalog/Model/Factory.php index 7dfeb0112e1..af1b176d106 100644 --- a/app/code/core/Mage/Catalog/Model/Factory.php +++ b/app/code/core/Mage/Catalog/Model/Factory.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Index.php b/app/code/core/Mage/Catalog/Model/Index.php index af447cd9e01..a17a036de64 100644 --- a/app/code/core/Mage/Catalog/Model/Index.php +++ b/app/code/core/Mage/Catalog/Model/Index.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Indexer/Url.php b/app/code/core/Mage/Catalog/Model/Indexer/Url.php index 51135184b93..d780a846e99 100644 --- a/app/code/core/Mage/Catalog/Model/Indexer/Url.php +++ b/app/code/core/Mage/Catalog/Model/Indexer/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -26,6 +27,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.php b/app/code/core/Mage/Catalog/Model/Layer.php index a3bd71aa3c1..32fd1e7d129 100644 --- a/app/code/core/Mage/Catalog/Model/Layer.php +++ b/app/code/core/Mage/Catalog/Model/Layer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog view layer model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method $this setStore(int $value) */ @@ -115,8 +116,6 @@ public function prepareProductCollection($collection) ->addPriceData() ->addTaxPercents() ->addUrlRewrite($this->getCurrentCategory()->getId()); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection); return $this; diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php index 050de5fbfbd..7930c1a6f02 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,7 +97,7 @@ public function apply(Zend_Controller_Request_Abstract $request, $filterBlock) } /** - * Get fiter items count + * Get filter items count * * @return int */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php index 4d1b692bfb3..7ebd4f2826e 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,7 +139,7 @@ protected function _getItemsData() $data[] = [ 'label' => $option['label'], 'value' => $option['value'], - 'count' => isset($optionsCount[$option['value']]) ? $optionsCount[$option['value']] : 0, + 'count' => $optionsCount[$option['value']] ?? 0, ]; } } diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php index 1a0b6c1a38d..05710abbc26 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php index 8d25ab9a6ba..479918a0389 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php index c65a0df1a85..587926201dd 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Filter item model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method int getCount() * @method $this setCount(int $value) diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php index 66328feaa8b..683bb4d30c2 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Layer price filter * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * * @method array getInterval() * @method $this setInterval(array $value) @@ -540,7 +541,7 @@ public function getClearLinkText() * @param null|int $offset * @param null|int $lowerPrice * @param null|int $upperPrice - * @return array|false + * @return array */ public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPrice = null) { diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php index 28c5cb77f6b..2ae38f6ecbc 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Layer/State.php b/app/code/core/Mage/Catalog/Model/Layer/State.php index ab105eb4898..94b1ddc6060 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/State.php +++ b/app/code/core/Mage/Catalog/Model/Layer/State.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php index 94831daa441..d2ae009cd2c 100644 --- a/app/code/core/Mage/Catalog/Model/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Catalog/Model/Product.php index 9fcaf258dd6..bfdd002b8d9 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product _getResource() * @method Mage_Catalog_Model_Resource_Product getResource() * @method Mage_Catalog_Model_Resource_Product_Collection getCollection() @@ -256,10 +261,6 @@ * @method bool hasWishlistStoreId() * @method int getWishlistStoreId() * @method $this setWishlistStoreId(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract { @@ -325,14 +326,14 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract /** * Flag for available duplicate function * - * @var boolean + * @var bool */ protected $_isDuplicable = true; /** * Flag for get Price function * - * @var boolean + * @var bool */ protected $_calculatePrice = true; @@ -533,7 +534,7 @@ public function getLinkInstance() * Retrieve product id by sku * * @param string $sku - * @return integer + * @return int */ public function getIdBySku($sku) { @@ -543,7 +544,7 @@ public function getIdBySku($sku) /** * Retrieve product category id * - * @return int + * @return int|false */ public function getCategoryId() { @@ -831,6 +832,7 @@ protected function _afterDeleteCommit() $indexer = Mage::getSingleton('index/indexer'); $indexer->processEntityAction($this, self::ENTITY, Mage_Index_Model_Event::TYPE_DELETE); + return $this; } /** @@ -908,7 +910,7 @@ public function getTierPriceCount() } /** - * Get formated by currency tier price + * Get formatted by currency tier price * * @param double $qty * @return array | double @@ -919,7 +921,7 @@ public function getFormatedTierPrice($qty = null) } /** - * Get formated by currency product price + * Get formatted by currency product price * * @return array|double */ @@ -953,10 +955,7 @@ public function setFinalPrice($price) public function getFinalPrice($qty = null) { $price = $this->_getData('final_price'); - if ($price !== null) { - return $price; - } - return $this->getPriceModel()->getFinalPrice($qty, $this); + return $price ?? $this->getPriceModel()->getFinalPrice($qty, $this); } /** @@ -1257,7 +1256,7 @@ public function getMediaGalleryImages() continue; } $image['url'] = $this->getMediaConfig()->getMediaUrl($image['file']); - $image['id'] = isset($image['value_id']) ? $image['value_id'] : null; + $image['id'] = $image['value_id'] ?? null; $image['path'] = $this->getMediaConfig()->getMediaPath($image['file']); $images->addItem(new Varien_Object($image)); } @@ -1273,8 +1272,8 @@ public function getMediaGalleryImages() * @param string $file file path of image in file system * @param string|array $mediaAttribute code of attribute with type 'media_image', * leave blank if image should be only in gallery - * @param boolean $move if true, it will move source file - * @param boolean $exclude mark image as disabled in product page view + * @param bool $move if true, it will move source file + * @param bool $exclude mark image as disabled in product page view * @return $this */ public function addImageToMediaGallery($file, $mediaAttribute = null, $move = false, $exclude = true) @@ -1504,7 +1503,7 @@ public function isVisibleInSiteVisibility() /** * Checks product can be duplicated * - * @return boolean + * @return bool */ public function isDuplicable() { @@ -1514,12 +1513,12 @@ public function isDuplicable() /** * Set is duplicable flag * - * @param boolean $value + * @param bool $value * @return $this */ public function setIsDuplicable($value) { - $this->_isDuplicable = (boolean) $value; + $this->_isDuplicable = (bool) $value; return $this; } @@ -1885,11 +1884,7 @@ public function addOption(Mage_Catalog_Model_Product_Option $option) */ public function getOptionById($optionId) { - if (isset($this->_options[$optionId])) { - return $this->_options[$optionId]; - } - - return null; + return $this->_options[$optionId] ?? null; } /** @@ -1962,10 +1957,7 @@ public function getCustomOptions() */ public function getCustomOption($code) { - if (isset($this->_customOptions[$code])) { - return $this->_customOptions[$code]; - } - return null; + return $this->_customOptions[$code] ?? null; } /** @@ -2089,7 +2081,7 @@ public function getReservedAttributes() * Check whether attribute reserved or not * * @param Mage_Catalog_Model_Entity_Attribute $attribute Attribute model object - * @return boolean + * @return bool */ public function isReservedAttribute($attribute) { @@ -2126,7 +2118,7 @@ public function reset() } /** - * Get cahce tags associated with object id + * Get cache tags associated with object id * * @return array */ @@ -2141,7 +2133,7 @@ public function getCacheIdTagsWithCategories() } /** - * Remove model onject related cache + * Remove model object related cache * * @return Mage_Core_Model_Abstract */ @@ -2158,7 +2150,7 @@ public function cleanModelCache() * Check for empty SKU on each product * * @param array $productIds - * @return boolean|null + * @return bool|null */ public function isProductsHasSku(array $productIds) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Action.php b/app/code/core/Mage/Catalog/Model/Product/Action.php index bc5465b0099..5ac5bb48eb0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Product/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,10 +31,6 @@ */ class Mage_Catalog_Model_Product_Action extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('catalog/product_action'); diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index 3f75bb8081f..1fc5a5fe30a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -219,7 +220,7 @@ public function create($type, $set, $sku, $productData, $store = null) * @param array $productData * @param string|int $store * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception * @throws Mage_Core_Model_Store_Exception */ @@ -336,7 +337,7 @@ protected function _prepareDataForSave($product, $productData) * @param string $fromDate * @param string $toDate * @param string|int $store - * @return boolean + * @return bool */ public function setSpecialPrice($productId, $specialPrice = null, $fromDate = null, $toDate = null, $store = null) { @@ -370,7 +371,7 @@ public function getSpecialPrice($productId, $store = null) * * @param int|string $productId * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function delete($productId, $identifierType = null) 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..1e747a97ca5 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -160,7 +161,7 @@ public function create($type, $set, $sku, $productData, $store = null) * @param array $productData * @param string|int $store * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception * @throws Mage_Core_Model_Store_Exception */ @@ -203,7 +204,7 @@ public function update($productId, $productData, $store = null, $identifierType * @param array $productData * @param string|int $store * @param string $identifierType - * @return boolean + * @return bool */ public function multiUpdate($productIds, $productData, $store = null, $identifierType = null) { @@ -328,7 +329,7 @@ protected function _prepareDataForSave($product, $productData) * @param string|int $store * @param string $identifierType OPTIONAL If 'sku' - search product by SKU, if any except for NULL - search by ID, * otherwise - try to determine identifier type automatically - * @return boolean + * @return bool */ public function setSpecialPrice( $productId, diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php index 304f22cd7eb..92aa29c6760 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -132,7 +133,7 @@ public function types() * Create new product attribute * * @param array $data input data - * @return integer + * @return int */ public function create($data) { @@ -185,9 +186,9 @@ public function create($data) /** * Update product attribute * - * @param string|integer $attribute attribute code or ID + * @param string|int $attribute attribute code or ID * @param array $data - * @return boolean + * @return bool */ public function update($attribute, $data) { @@ -217,8 +218,8 @@ public function update($attribute, $data) /** * Remove attribute * - * @param integer|string $attribute attribute ID or code - * @return boolean + * @param int|string $attribute attribute ID or code + * @return true|void */ public function remove($attribute) { @@ -243,7 +244,7 @@ public function remove($attribute) /** * Get full information about attribute with list of options * - * @param integer|string $attribute attribute ID or code + * @param int|string $attribute attribute ID or code * @return array */ public function info($attribute) @@ -351,7 +352,7 @@ public function info($attribute) /** * Add option to select or multiselect attribute * - * @param integer|string $attribute attribute ID or code + * @param int|string $attribute attribute ID or code * @param array $data * @return bool */ @@ -408,8 +409,8 @@ public function addOption($attribute, $data) /** * Remove option from select or multiselect attribute * - * @param integer|string $attribute attribute ID or code - * @param integer $optionId option to remove ID + * @param int|string $attribute attribute ID or code + * @param int $optionId option to remove ID * @return bool */ public function removeOption($attribute, $optionId) @@ -496,7 +497,7 @@ protected function _prepareDataForSave(&$data) /** * Load model by attribute ID or code * - * @param integer|string $attribute + * @param int|string $attribute * @return Mage_Catalog_Model_Resource_Eav_Attribute */ protected function _getAttribute($attribute) 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..d49082d95cc 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,7 +32,7 @@ class Mage_Catalog_Model_Product_Attribute_Api_V2 extends Mage_Catalog_Model_Pro * Create new product attribute * * @param array $data input data - * @return integer + * @return int */ public function create($data) { @@ -44,9 +45,9 @@ public function create($data) /** * Update product attribute * - * @param string|integer $attribute attribute code or ID + * @param string|int $attribute attribute code or ID * @param array $data - * @return boolean + * @return bool */ public function update($attribute, $data) { @@ -59,7 +60,7 @@ public function update($attribute, $data) /** * Add option to select or multiselect attribute * - * @param integer|string $attribute attribute ID or code + * @param int|string $attribute attribute ID or code * @param array $data * @return bool */ @@ -72,7 +73,7 @@ public function addOption($attribute, $data) /** * Get full information about attribute with list of options * - * @param integer|string $attribute attribute ID or code + * @param int|string $attribute attribute ID or code * @return array */ public function info($attribute) diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php index 9a867f1919f..94e6dd0fd54 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @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/Groupprice.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php index c3ad2efe3b4..748bb50937f 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php index 3a30de7d91f..3683ff08799 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -323,7 +324,7 @@ public function afterSave($object) 'all_groups' => $useForAllGroups ? 1 : 0, 'customer_group_id' => $customerGroupId, 'value' => $data['price'], - 'is_percent' => isset($data['is_percent']) ? $data['is_percent'] : 0, + 'is_percent' => $data['is_percent'] ?? 0, ], $this->_getAdditionalUniqueFields($data)); } diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index fd732ca7f9c..b8ab8eab181 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,16 +24,20 @@ * * @category Mage * @package Mage_Catalog - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Attribute_Backend_Media extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { + /** + * @var array + */ protected $_renamedImages = []; /** * Load attribute data after product loaded * * @param Mage_Catalog_Model_Product $object + * @return $this */ public function afterLoad($object) { @@ -52,6 +57,7 @@ public function afterLoad($object) } $object->setData($attrCode, $value); + return $this; } /** @@ -61,11 +67,7 @@ public function afterLoad($object) */ protected function _getDefaultValue($key, &$image) { - if (isset($image[$key . '_default'])) { - return $image[$key . '_default']; - } - - return ''; + return $image[$key . '_default'] ?? ''; } /** @@ -184,11 +186,7 @@ public function beforeSave($object) */ public function getRenamedImage($file) { - if (isset($this->_renamedImages[$file])) { - return $this->_renamedImages[$file]; - } - - return $file; + return $this->_renamedImages[$file] ?? $file; } /** @@ -266,8 +264,8 @@ public function afterSave($object) * @param string $file file path of image in file system * @param string|array $mediaAttribute code of attribute with type 'media_image', * leave blank if image should be only in gallery - * @param boolean $move if true, it will move source file - * @param boolean $exclude mark image as disabled in product page view + * @param bool $move if true, it will move source file + * @param bool $exclude mark image as disabled in product page view * @return string * @throws Mage_Core_Exception */ @@ -365,8 +363,8 @@ public function addImage( * @param Mage_Catalog_Model_Product $product * @param array $fileAndAttributesArray array of arrays of filename and corresponding media attribute * @param string $filePath path, where image cand be found - * @param boolean $move if true, it will move source file - * @param boolean $exclude mark image as disabled in product page view + * @param bool $move if true, it will move source file + * @param bool $exclude mark image as disabled in product page view * @return array array of parallel arrays with original and renamed files * @throws Mage_Core_Exception */ @@ -471,7 +469,7 @@ public function removeImage(Mage_Catalog_Model_Product $product, $file) * * @param Mage_Catalog_Model_Product $product * @param string $file - * @return array|boolean + * @return array|bool */ public function getImage(Mage_Catalog_Model_Product $product, $file) { @@ -688,7 +686,7 @@ public function duplicate($object) $this->_getResource()->duplicate( $this, - (isset($mediaGalleryData['duplicate']) ? $mediaGalleryData['duplicate'] : []), + $mediaGalleryData['duplicate'] ?? [], $object->getOriginalId(), $object->getId() ); diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php index f78085001bb..2ca5091bffe 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php index 299bf0de99c..c02606f58c9 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Recurring.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php index b10daf50556..c374eadc5a8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php @@ -7,25 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Backend for recurring profile parameter + * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Attribute_Backend_Recurring extends Mage_Eav_Model_Entity_Attribute_Backend_Serialized { /** * Serialize or remove before saving * @param Mage_Catalog_Model_Product $product + * @return $this */ public function beforeSave($product) { @@ -36,11 +42,12 @@ public function beforeSave($product) $product->unsRecurringProfile(); } } + return $this; } /** * Unserialize or remove on failure - * @param Varien_Object|Mage_Catalog_Model_Product $product + * @param Mage_Catalog_Model_Product $product * @return $this */ protected function _unserialize(Varien_Object $product) 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..68dce6b4ca1 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c14704cfd5e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @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..c9fd2115525 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,9 +25,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..68e8a78f942 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5a025c9a894 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php index 808e54ac6bb..b67ef52fc24 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Group.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php index a65c99383bf..8b5aa8d3851 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php index b2788f17102..d938ab5d322 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -199,7 +200,7 @@ public function create($productId, $data, $store = null, $identifierType = null) * @param array $data * @param string|int $store * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function update($productId, $file, $data, $store = null, $identifierType = null) @@ -270,7 +271,7 @@ public function update($productId, $file, $data, $store = null, $identifierType * @param int|string $productId * @param string $file * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function remove($productId, $file, $identifierType = null) @@ -345,7 +346,7 @@ protected function _prepareImageData($data) * Retrieve gallery attribute from product * * @param Mage_Catalog_Model_Product $product - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute|boolean + * @return Mage_Catalog_Model_Resource_Attribute|bool */ protected function _getGalleryAttribute($product) { 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..baff7de2dd3 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php index 442c301944a..29b71a4a34b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,7 +55,7 @@ public function items() * * @param string $attributeSetName * @param string $skeletonSetId - * @return integer + * @return int */ public function create($attributeSetName, $skeletonSetId) { @@ -229,7 +230,7 @@ public function groupAdd($attributeSetId, $groupName) * * @param string|int $groupId * @param string $groupName - * @return boolean + * @return bool */ public function groupRename($groupId, $groupName) { 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..1f5a48aa30e 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Boolean.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php index a80529dd921..62426ecb13d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Countryofmanufacture.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php index c4b0eeba1b4..3508d994775 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Inputtype.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php index ca2a1fbbfe3..d5635b60182 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Product attribute source input types * * @category Mage - * @package Mage_Eav + * @package Mage_Catalog * @author Magento Core Team */ class Mage_Catalog_Model_Product_Attribute_Source_Inputtype extends Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php index 945f136d54e..ad383e09cb9 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..791aa1d14be 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Enabled.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php index 1edb7481754..3e8860e0c5d 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Price.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php index 8b014b560ca..e75c5678733 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php index 3dbcfa99409..b0fb164ea37 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,11 +54,12 @@ public function info($productId, $identifierType = null) foreach ($tierPrices as $tierPrice) { $row = []; - $row['customer_group_id'] = (empty($tierPrice['all_groups']) ? $tierPrice['cust_group'] : 'all' ); - $row['website'] = ($tierPrice['website_id'] ? - Mage::app()->getWebsite($tierPrice['website_id'])->getCode() : - 'all' - ); + $row['customer_group_id'] = (empty($tierPrice['all_groups']) ? $tierPrice['cust_group'] : 'all'); + $row['website'] = ( + $tierPrice['website_id'] + ? Mage::app()->getWebsite($tierPrice['website_id'])->getCode() + : 'all' + ); $row['qty'] = $tierPrice['price_qty']; $row['price'] = $tierPrice['price']; @@ -73,7 +75,7 @@ public function info($productId, $identifierType = null) * @param int|string $productId * @param array $tierPrices * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function update($productId, $tierPrices, $identifierType = null) @@ -112,7 +114,7 @@ public function update($productId, $tierPrices, $identifierType = null) * * @param Mage_Catalog_Model_Product $product * @param array $tierPrices - * @return array + * @return array|null */ public function prepareTierPrices($product, $tierPrices = null) { 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..8ec1fda6db0 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,7 +33,7 @@ class Mage_Catalog_Model_Product_Attribute_Tierprice_Api_V2 extends Mage_Catalog * * @param Mage_Catalog_Model_Product $product * @param array $tierPrices - * @return array + * @return array|null */ public function prepareTierPrices($product, $tierPrices = null) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php index cb01ec3cca2..a6b79b8b4fc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Compare Item Model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Compare_Item _getResource() * @method Mage_Catalog_Model_Resource_Product_Compare_Item getResource() * @@ -33,10 +38,6 @@ * @method bool hasVisitorId() * @method bool hasCustomerId() * @method bool hasStoreId() - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Compare_Item extends Mage_Core_Model_Abstract { @@ -63,9 +64,6 @@ class Mage_Catalog_Model_Product_Compare_Item extends Mage_Core_Model_Abstract */ protected $_eventObject = 'item'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('catalog/product_compare_item'); @@ -183,7 +181,7 @@ public function bindCustomerLogin() /** * Customer logout bind process * - * @param Varien_Event_Observer $observer + * @param Varien_Event_Observer|null $observer * @return $this */ public function bindCustomerLogout(Varien_Event_Observer $observer = null) diff --git a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php index ac370c8ac19..59f8130d21a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Compare/List.php +++ b/app/code/core/Mage/Catalog/Model/Product/Compare/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Condition.php b/app/code/core/Mage/Catalog/Model/Product/Condition.php index c512245746d..bab418623c1 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Condition.php +++ b/app/code/core/Mage/Catalog/Model/Product/Condition.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Condition/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php index 398dc6be36c..517e0ba213a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + */ interface Mage_Catalog_Model_Product_Condition_Interface { /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php index 4568550f4dd..c6cf1624322 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Configuration/Item/Option.php b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php index 2f267234be9..11a1bdb07c7 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php @@ -7,28 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Configuration item option model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Configuration_Item_Option extends Varien_Object implements Mage_Catalog_Model_Product_Configuration_Item_Option_Interface { /** - * Returns value of this option * @return mixed */ public function getValue() diff --git a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php index 0fdc9e135b6..623b73ea2dd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php index fceb34096e0..b35fe0157e2 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php index 8c3c7cf351d..115ea793b18 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php index b8de0f5637d..5341d866457 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index bcba6f8fbeb..45653cdbbf0 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php index ef8a1937ed9..bcdeff0ce68 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,6 +52,9 @@ class Mage_Catalog_Model_Product_Indexer_Eav extends Mage_Index_Model_Indexer_Ab ], Mage_Catalog_Model_Convert_Adapter_Product::ENTITY => [ Mage_Index_Model_Event::TYPE_SAVE + ], + Mage_Core_Model_Store::ENTITY => [ + Mage_Index_Model_Event::TYPE_SAVE ] ]; @@ -83,10 +87,6 @@ public function getDescription() return Mage::helper('catalog')->__('Index product attributes for layered navigation building'); } - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('catalog/product_indexer_eav'); @@ -123,6 +123,14 @@ protected function _registerEvent(Mage_Index_Model_Event $event) } } elseif ($entity == Mage_Catalog_Model_Convert_Adapter_Product::ENTITY) { $event->addNewData('catalog_product_eav_reindex_all', true); + } elseif ($entity == Mage_Core_Model_Store::ENTITY) { + if ($event->getType() === Mage_Index_Model_Event::TYPE_SAVE) { + /** @var Mage_Core_Model_Store $store */ + $store = $event->getDataObject(); + if ($store->getOrigData('is_active') != $store->getIsActive() && $store->getIsActive()) { + $event->getProcess()->changeStatus(Mage_Index_Model_Process::STATUS_REQUIRE_REINDEX); + } + } } } diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php index c2ae2f4b8bd..a059b357c3a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php index 199a1abbcba..5ab00fb6d10 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Indexer_Price _getResource() * @method Mage_Catalog_Model_Resource_Product_Indexer_Price getResource() * @method Mage_Catalog_Model_Product_Indexer_Price setEntityId(int $value) @@ -37,10 +42,6 @@ * @method Mage_Catalog_Model_Product_Indexer_Price setMaxPrice(float $value) * @method float getTierPrice() * @method Mage_Catalog_Model_Product_Indexer_Price setTierPrice(float $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Indexer_Price extends Mage_Index_Model_Indexer_Abstract { @@ -82,10 +83,6 @@ class Mage_Catalog_Model_Product_Indexer_Price extends Mage_Index_Model_Indexer_ Mage_CatalogInventory_Model_Stock_Item::XML_PATH_MANAGE_STOCK ]; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('catalog/product_indexer_price'); diff --git a/app/code/core/Mage/Catalog/Model/Product/Link.php b/app/code/core/Mage/Catalog/Model/Product/Link.php index d3ceec59131..a90ed0d3f3c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product link model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Link _getResource() * @method Mage_Catalog_Model_Resource_Product_Link getResource() * @method int getProductId() @@ -29,10 +34,6 @@ * @method Mage_Catalog_Model_Product_Link setLinkedProductId(int $value) * @method int getLinkTypeId() * @method Mage_Catalog_Model_Product_Link setLinkTypeId(int $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Link extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php index d4141ca0e90..4ac9d2112fe 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Link/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +92,7 @@ public function items($type, $productId, $identifierType = null) * @param int|string $linkedProductId * @param array $data * @param string $identifierType - * @return boolean + * @return bool */ public function assign($type, $productId, $linkedProductId, $data = [], $identifierType = null) { @@ -148,7 +149,7 @@ public function assign($type, $productId, $linkedProductId, $data = [], $identif * @param int|string $linkedProductId * @param array $data * @param string $identifierType - * @return boolean + * @return bool */ public function update($type, $productId, $linkedProductId, $data = [], $identifierType = null) { @@ -203,7 +204,7 @@ public function update($type, $productId, $linkedProductId, $data = [], $identif * @param int|string $productId * @param int|string $linkedProductId * @param string $identifierType - * @return boolean + * @return bool */ public function remove($type, $productId, $linkedProductId, $identifierType = null) { 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..fed24d36a3e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -35,7 +36,7 @@ class Mage_Catalog_Model_Product_Link_Api_V2 extends Mage_Catalog_Model_Product_ * @param int|string $linkedProductId * @param array $data * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function assign($type, $productId, $linkedProductId, $data = [], $identifierType = null) @@ -93,7 +94,7 @@ public function assign($type, $productId, $linkedProductId, $data = [], $identif * @param int|string $linkedProductId * @param array $data * @param null $identifierType - * @return boolean + * @return bool * @throws Mage_Api_Exception */ public function update($type, $productId, $linkedProductId, $data = [], $identifierType = null) diff --git a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php index 8297a3f4496..10e1d398279 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Media/Config.php +++ b/app/code/core/Mage/Catalog/Model/Product/Media/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Catalog/Model/Product/Option.php index 04e4ffccb2a..67fe49d99be 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product option model * + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team + * * @method Mage_Catalog_Model_Resource_Product_Option _getResource() * @method Mage_Catalog_Model_Resource_Product_Option getResource() * @method Mage_Catalog_Model_Resource_Product_Option_Collection getCollection() @@ -51,10 +56,6 @@ * @method string getTitle() * @method string getType() * @method $this setType(string $value) - * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team */ class Mage_Catalog_Model_Product_Option extends Mage_Core_Model_Abstract { @@ -156,9 +157,6 @@ class Mage_Catalog_Model_Product_Option extends Mage_Core_Model_Abstract */ protected $_values = []; - /** - * Constructor - */ protected function _construct() { $this->_init('catalog/product_option'); @@ -184,11 +182,7 @@ public function addValue(Mage_Catalog_Model_Product_Option_Value $value) */ public function getValueById($valueId) { - if (isset($this->_values[$valueId])) { - return $this->_values[$valueId]; - } - - return null; + return $this->_values[$valueId] ?? null; } /** @@ -272,7 +266,7 @@ public function getProduct() /** * Set product instance * - * @param Mage_Catalog_Model_Product $product + * @param Mage_Catalog_Model_Product|null $product * @return $this */ public function setProduct(Mage_Catalog_Model_Product $product = null) @@ -305,7 +299,7 @@ public function getGroupByType($type = null) self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE, ]; - return isset($optionGroupsToTypes[$type])?$optionGroupsToTypes[$type]:''; + return $optionGroupsToTypes[$type] ?? ''; } /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php index b912cbc3fe6..6ce1fe42ebe 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -279,7 +280,7 @@ public function items($productId, $store = null) * Remove product custom option * * @param string $optionId - * @return boolean + * @return bool */ public function remove($optionId) { 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..e0bbf57462b 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php index 9541e02b42b..59b16be24cc 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Custom Options Observer * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Product_Option_Observer { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php index 96ee7c106e3..5864931ee58 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,14 +66,14 @@ public function validateUserValue($values) if ($isValid) { $this->setUserValue( [ - 'date' => isset($value['date']) ? $value['date'] : '', + 'date' => $value['date'] ?? '', 'year' => isset($value['year']) ? intval($value['year']) : 0, 'month' => isset($value['month']) ? intval($value['month']) : 0, 'day' => isset($value['day']) ? intval($value['day']) : 0, 'hour' => isset($value['hour']) ? intval($value['hour']) : 0, 'minute' => isset($value['minute']) ? intval($value['minute']) : 0, - 'day_part' => isset($value['day_part']) ? $value['day_part'] : '', - 'date_internal' => isset($value['date_internal']) ? $value['date_internal'] : '', + 'day_part' => $value['day_part'] ?? '', + 'date_internal' => $value['date_internal'] ?? '', ] ); } elseif (!$isValid && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) { @@ -242,7 +243,7 @@ public function prepareOptionValueForRequest($optionValue) /** * Use Calendar on frontend or not * - * @return boolean + * @return bool */ public function useCalendar() { @@ -252,7 +253,7 @@ public function useCalendar() /** * Time Format * - * @return boolean + * @return bool */ public function is24hTimeFormat() { @@ -308,7 +309,7 @@ protected function _setInternalInRequest($internalValue) /** * Does option have date? * - * @return boolean + * @return bool */ protected function _dateExists() { @@ -321,7 +322,7 @@ protected function _dateExists() /** * Does option have time? * - * @return boolean + * @return bool */ protected function _timeExists() { 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..a9c740b0f72 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,12 +29,13 @@ * @property string $_formattedOptionValue * * @method $this setConfigurationItemOption(Varien_Object $value) - * @method $this setRequest(Varien_Object $value) - * @method $this setProcessMode(string $value) * @method bool getIsValid() * @method $this setIsValid(bool $value) * @method string getProcessMode() + * @method $this setProcessMode(string $value) + * @method $this setQuoteItem(Mage_Sales_Model_Quote_Item $value) * @method array|int getUserValue() + * @method $this setRequest(Varien_Object $value) * @method $this setUserValue(array|int $value) */ class Mage_Catalog_Model_Product_Option_Type_Default extends Varien_Object @@ -53,8 +55,6 @@ class Mage_Catalog_Model_Product_Option_Type_Default extends Varien_Object protected $_product; /** - * description - * * @var mixed */ protected $_productOptions = []; @@ -248,7 +248,7 @@ public function prepareForCart() /** * Flag to indicate that custom option has own customized output (blocks, native html etc.) * - * @return boolean + * @return bool */ public function isCustomizedView() { @@ -274,7 +274,7 @@ public function getFormattedOptionValue($optionValue) */ public function getCustomizedView($optionInfo) { - return isset($optionInfo['value']) ? $optionInfo['value'] : $optionInfo; + return $optionInfo['value'] ?? $optionInfo; } /** @@ -374,17 +374,14 @@ public function getProductOptions() } } } - if (isset($this->_productOptions[$this->getProduct()->getId()])) { - return $this->_productOptions[$this->getProduct()->getId()]; - } - return []; + return $this->_productOptions[$this->getProduct()->getId()] ?? []; } /** * Return final chargable price for option * * @param float $price Price of option - * @param boolean $isPercent Price type - percent or fixed + * @param bool $isPercent Price type - percent or fixed * @param float $basePrice For percent price type * @return float */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index ba0a8ed9d9f..610b4469cac 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,6 +61,7 @@ public function getCustomizedView($optionInfo) } catch (Exception $e) { return $optionInfo['value']; } + return ''; } /** @@ -385,6 +387,7 @@ protected function _validateFile($optionValue) $this->setIsValid(false); Mage::throwException(Mage::helper('catalog')->__('Please specify the product required option(s)')); } + return false; } /** @@ -639,7 +642,7 @@ public function copyQuoteToOrder() /** * Main Destination directory * - * @param boolean $relative If true - returns relative path to the webroot + * @param bool $relative If true - returns relative path to the webroot * @return string */ public function getTargetDir($relative = false) @@ -651,7 +654,7 @@ public function getTargetDir($relative = false) /** * Quote items destination directory * - * @param boolean $relative If true - returns relative path to the webroot + * @param bool $relative If true - returns relative path to the webroot * @return string */ public function getQuoteTargetDir($relative = false) @@ -662,7 +665,7 @@ public function getQuoteTargetDir($relative = false) /** * Order items destination directory * - * @param boolean $relative If true - returns relative path to the webroot + * @param bool $relative If true - returns relative path to the webroot * @return string */ public function getOrderTargetDir($relative = false) @@ -757,7 +760,7 @@ protected function _parseExtensionsString($extensions) * Simple check if file is image * * @param array|string $fileInfo - either file data from Zend_File_Transfer or file path - * @return boolean + * @return bool */ protected function _isImage($fileInfo) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php index e2c62349747..f23fb6c3736 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -60,8 +61,7 @@ public function validateUserValue($values) /** * Prepare option value for cart * - * @throws Mage_Core_Exception - * @return mixed Prepared option value + * @return int|string|null Prepared option value */ public function prepareForCart() { @@ -299,7 +299,7 @@ public function getOptionSku($optionValue, $skuDelimiter) /** * Check if option has single or multiple values selection * - * @return boolean + * @return bool */ protected function _isSingleSelection() { 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..df03d1f9882 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @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..5dc86c3c16b 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php @@ -7,20 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Collection getCollection() * @method Mage_Catalog_Model_Resource_Product_Option_Value _getResource() * @method Mage_Catalog_Model_Resource_Product_Option_Value getResource() * @method int getOptionId() @@ -35,10 +41,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.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php index 9c48c87437d..852379caa01 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -162,7 +163,7 @@ public function update($valueId, $data, $store = null) * Delete value from select option * * @param int $valueId - * @return boolean + * @return bool */ public function remove($valueId) { 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..b4f032503d6 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -89,7 +90,7 @@ public function update($valueId, $data, $store = null) * Delete value from select option * * @param int $valueId - * @return boolean + * @return bool */ public function remove($valueId) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php index cca3d326562..d2ec4123959 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Product/Status.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +34,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 +47,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..2fdbea347dd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -169,7 +170,7 @@ public static function getOptions() public static function getOptionText($optionId) { $options = self::getOptionArray(); - return isset($options[$optionId]) ? $options[$optionId] : null; + return $options[$optionId] ?? null; } /** @@ -180,10 +181,7 @@ public static function getTypes() if (is_null(self::$_types)) { $productTypes = Mage::getConfig()->getNode('global/catalog/product/type')->asArray(); foreach ($productTypes as $productKey => $productConfig) { - $moduleName = 'catalog'; - if (isset($productConfig['@']['module'])) { - $moduleName = $productConfig['@']['module']; - } + $moduleName = $productConfig['@']['module'] ?? 'catalog'; $translatedLabel = Mage::helper($moduleName)->__($productConfig['label']); $productTypes[$productKey]['label'] = $translatedLabel; } diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php index c32d33c11de..e46ba8033cb 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -185,7 +186,7 @@ public function getChildrenIds($parentId, $required = true) } /** - * Retrieve parent ids array by requered child + * Retrieve parent ids array by required child * * @param int|array $childId * @return array @@ -209,7 +210,7 @@ public function getSetAttributes($product = null) } /** - * Compare attribues sorting + * Compare attributes sorting * * @param Mage_Catalog_Model_Entity_Attribute $attribute1 * @param Mage_Catalog_Model_Entity_Attribute $attribute2 @@ -295,7 +296,7 @@ public function isSalable($product = null) return null; } - return (boolean) (int) $salable; + return (bool) (int) $salable; } /** @@ -370,7 +371,7 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process } /** - * Process product configuaration + * Process product configuration * * @param Varien_Object $buyRequest * @param Mage_Catalog_Model_Product $product @@ -434,10 +435,10 @@ public function processFileQueue() if (isset($queueOptions['operation']) && $operation = $queueOptions['operation']) { switch ($operation) { case 'receive_uploaded_file': - $src = isset($queueOptions['src_name']) ? $queueOptions['src_name'] : ''; - $dst = isset($queueOptions['dst_name']) ? $queueOptions['dst_name'] : ''; + $src = $queueOptions['src_name'] ?? ''; + $dst = $queueOptions['dst_name'] ?? ''; /** @var Zend_File_Transfer_Adapter_Http $uploader */ - $uploader = isset($queueOptions['uploader']) ? $queueOptions['uploader'] : null; + $uploader = $queueOptions['uploader'] ?? null; $path = dirname($dst); $io = new Varien_Io_File(); @@ -848,11 +849,11 @@ public function setStoreFilter($store = null, $product = null) } /** - * Allow for updates of children qty's + * Allow for updates of children quantities * (applicable for complicated product types. As default returns false) * * @param null $product - * @return boolean false + * @return bool false */ public function getForceChildItemQtyChanges($product = null) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php index 86ad8cc978a..0f1e4d2cd27 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php index d7ee94ca0cf..c81dfe98739 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php index 8b84544e5d0..c881738d3c6 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -217,7 +218,7 @@ public function getUsedProductAttributeIds($product = null) * Retrieve used product attributes * * @param Mage_Catalog_Model_Product $product - * @return Mage_Catalog_Model_Product_Type_Configurable_Attribute[] + * @return Mage_Catalog_Model_Resource_Eav_Attribute[] */ public function getUsedProductAttributes($product = null) { @@ -430,7 +431,7 @@ public function save($product = null) */ if ($data = $this->getProduct($product)->getConfigurableAttributesData()) { foreach ($data as $attributeData) { - $id = isset($attributeData['id']) ? $attributeData['id'] : null; + $id = $attributeData['id'] ?? null; Mage::getModel('catalog/product_type_configurable_attribute') ->setData($attributeData) ->setId($id) diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php index 121a14ae325..9d1464e4008 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,10 +50,6 @@ */ class Mage_Catalog_Model_Product_Type_Configurable_Attribute extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('catalog/product_type_configurable_attribute'); diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php index b8a5f6a125c..4d4154c3417 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product type price 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_Configurable_Price extends Mage_Catalog_Model_Product_Type_Price { @@ -65,10 +66,10 @@ public function getTotalConfigurableItemsPrice($product, $finalPrice) { $price = 0.0; - $product->getTypeInstance(true) - ->setStoreFilter($product->getStore(), $product); - $attributes = $product->getTypeInstance(true) - ->getConfigurableAttributes($product); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $productType->setStoreFilter($product->getStore(), $product); + $attributes = $productType->getConfigurableAttributes($product); $selectedAttributes = []; if ($product->getCustomOption('attributes')) { @@ -80,7 +81,7 @@ public function getTotalConfigurableItemsPrice($product, $finalPrice) $attributeId = $attribute->getProductAttribute()->getId(); $value = $this->_getValueByIndex( $attribute->getPrices() ? $attribute->getPrices() : [], - isset($selectedAttributes[$attributeId]) ? $selectedAttributes[$attributeId] : null + $selectedAttributes[$attributeId] ?? null ); $product->setParentId(true); if ($value) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php index a7d6244bde7..66d4d05614c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php index b500598930c..43d3b8e5703 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Grouped product price 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_Grouped_Price extends Mage_Catalog_Model_Product_Type_Price { diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php index 71620224da2..13623c1375e 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product type price 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_Price { @@ -302,7 +303,7 @@ public function getTierPriceCount($product) * * @param float|null $qty * @param Mage_Catalog_Model_Product $product - * @return array|float + * @return array|float|string */ public function getFormatedTierPrice($qty, $product) { @@ -325,7 +326,7 @@ public function getFormatedTierPrice($qty, $product) * Get formatted by currency product price * * @param Mage_Catalog_Model_Product $product - * @return string | float + * @return string|float * @throws Mage_Core_Model_Store_Exception */ public function getFormatedPrice($product) 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..a2e92126b9a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Simple.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..866c1f2c2a8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..15f42d67972 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Url.php +++ b/app/code/core/Mage/Catalog/Model/Product/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..e0f4295f243 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php +++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -180,7 +181,7 @@ public static function getAllOptions() public static function getOptionText($optionId) { $options = self::getOptionArray(); - return isset($options[$optionId]) ? $options[$optionId] : null; + return $options[$optionId] ?? null; } /** diff --git a/app/code/core/Mage/Catalog/Model/Product/Website.php b/app/code/core/Mage/Catalog/Model/Product/Website.php index ab51135b1a5..a30649185d4 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Product/Website.php @@ -7,28 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php index bc3d82c1a9a..372fe4d5463 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,7 +63,7 @@ public function getDefaultStoreId() * * @param Varien_Object $object * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute - * @return boolean + * @return bool */ protected function _isApplicableAttribute($object, $attribute) { @@ -76,7 +77,7 @@ protected function _isApplicableAttribute($object, $attribute) * @param Mage_Eav_Model_Entity_Attribute_Abstract|Mage_Eav_Model_Entity_Attribute_Backend_Abstract|Mage_Eav_Model_Entity_Attribute_Frontend_Abstract|Mage_Eav_Model_Entity_Attribute_Source_Abstract $instance * @param string $method * @param array $args array of arguments - * @return boolean + * @return bool */ protected function _isCallableAttributeInstance($instance, $method, $args) { @@ -697,7 +698,7 @@ public function getAttributeRawValue($entityId, $attribute, $store) * Retrieve attribute's raw value from DB using its source model if available. * * @param int $entityId - * @param int|string|array $attribute atrribute's ids or codes + * @param int|string|array $attribute attribute's ids or codes * @param int|Mage_Core_Model_Store $store * @return bool|string|array */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Attribute.php index 4b109017686..a1ef6797631 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +56,7 @@ protected function _afterSave(Mage_Core_Model_Abstract $object) /** * Clear useless attribute values * - * @param Mage_Core_Model_Abstract $object + * @param Mage_Catalog_Model_Resource_Eav_Attribute $object * @return $this */ protected function _clearUselessAttributeValues(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Category.php index fa57de6392c..5fd1b80a3ac 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -73,7 +74,7 @@ public function __construct() /** * Set store Id * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -85,14 +86,11 @@ public function setStoreId($storeId) /** * Return store id * - * @return integer + * @return int */ public function getStoreId() { - if ($this->_storeId === null) { - return Mage::app()->getStore()->getId(); - } - return $this->_storeId; + return $this->_storeId ?? Mage::app()->getStore()->getId(); } /** @@ -550,11 +548,11 @@ public function getProductCount($category) /** * Retrieve categories * - * @param integer $parent - * @param integer $recursionLevel - * @param boolean|string $sorted - * @param boolean $asCollection - * @param boolean $toLoad + * @param int $parent + * @param int $recursionLevel + * @param bool|string $sorted + * @param bool $asCollection + * @param bool $toLoad * @return Varien_Data_Tree_Node_Collection|Mage_Catalog_Model_Resource_Category_Collection */ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true) @@ -690,7 +688,7 @@ protected function _getChildrenIdSelect($category, $recursive = true) * Return children ids of category * * @param Mage_Catalog_Model_Category $category - * @param boolean $recursive + * @param bool $recursive * @return array */ public function getChildren($category, $recursive = true) @@ -754,7 +752,7 @@ public function getAllChildren($category) * Check is category in list of store categories * * @param Mage_Catalog_Model_Category $category - * @return boolean + * @return bool */ public function isInRootCategoryList($category) { @@ -767,8 +765,8 @@ public function isInRootCategoryList($category) * Check category is forbidden to delete. * If category is root and assigned to store group return false * - * @param integer $categoryId - * @return boolean + * @param int $categoryId + * @return bool */ public function isForbiddenToDelete($categoryId) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php index 0bac3bc83b6..2c2e4e82c01 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php index 4b239bf71c5..e0630259987 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php index 1454457a31f..d248c669df4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog category landing page attribute source * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php index 181618cec38..2dbc82d3f4b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog category landing page attribute source * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php index 0331cdd8f4d..692604164b5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog category landing page attribute source * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Category_Attribute_Source_Page extends Mage_Eav_Model_Entity_Attribute_Source_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..82163305cd3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,15 +33,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'; @@ -69,7 +66,7 @@ class Mage_Catalog_Model_Resource_Category_Collection extends Mage_Catalog_Model /** * Load with product count flag * - * @var boolean + * @var bool */ protected $_loadWithProductCount = false; @@ -142,7 +139,7 @@ public function addIdFilter($categoryIds) /** * Set flag for loading product count * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setLoadProductCount($flag) @@ -245,8 +242,8 @@ protected function _loadProductCount() * Load product count for specified items * * @param array $items - * @param boolean $countRegular get product count for regular (non-anchor) categories - * @param boolean $countAnchor get product count for anchor categories + * @param bool $countRegular get product count for regular (non-anchor) categories + * @param bool $countAnchor get product count for anchor categories * @return $this */ public function loadProductCount($items, $countRegular = true, $countAnchor = true) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php index 34a312df3e8..f599a23161f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,7 +43,7 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc /** * Loaded * - * @var boolean + * @var bool */ protected $_loaded = false; @@ -129,10 +130,6 @@ public function __construct(array $args = []) parent::__construct(); } - /** - * Resource initializations - * - */ protected function _construct() { $this->_init('catalog/category_flat', 'entity_id'); @@ -141,7 +138,7 @@ protected function _construct() /** * Set store id * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -153,7 +150,7 @@ public function setStoreId($storeId) /** * Return store id * - * @return integer + * @return int */ public function getStoreId() { @@ -176,7 +173,7 @@ public function getMainTable() /** * Return name of table for given $storeId. * - * @param integer $storeId + * @param int $storeId * @return string */ public function getMainStoreTable($storeId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) @@ -197,7 +194,7 @@ public function getMainStoreTable($storeId = Mage_Catalog_Model_Abstract::DEFAUL /** * Return true if need use for each store different table of flat categories data. * - * @return boolean + * @return bool */ public function getUseStoreTables() { @@ -249,8 +246,8 @@ public function getInactiveCategoryIds() * Load nodes by parent id * * @param Mage_Catalog_Model_Category|int $parentNode - * @param integer $recursionLevel - * @param integer $storeId + * @param int $recursionLevel + * @param int $storeId * @param bool $onlyActive * @return array */ @@ -359,9 +356,9 @@ public function addChildNodes($children, $path, $parent) /** * Return sorted array of nodes * - * @param integer|null $parentId - * @param integer $recursionLevel - * @param integer $storeId + * @param int|null $parentId + * @param int $recursionLevel + * @param int $storeId * @return array */ public function getNodes($parentId, $recursionLevel = 0, $storeId = 0) @@ -398,11 +395,11 @@ public function getNodes($parentId, $recursionLevel = 0, $storeId = 0) /** * Return array or collection of categories * - * @param integer $parent - * @param integer $recursionLevel - * @param boolean|string $sorted - * @param boolean $asCollection - * @param boolean $toLoad + * @param int $parent + * @param int $recursionLevel + * @param bool|string $sorted + * @param bool $asCollection + * @param bool $toLoad * @return array|Varien_Data_Collection */ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $asCollection = false, $toLoad = true) @@ -432,7 +429,7 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as /** * Return node with id $nodeId * - * @param integer $nodeId + * @param int $nodeId * @param array $nodes * @return Varien_Object|array */ @@ -568,7 +565,7 @@ public function createTable($stores) /** * Creating table and adding attributes as fields to table * - * @param array|integer $store + * @param array|int $store * @return $this */ protected function _createTable($store) @@ -817,7 +814,7 @@ protected function _getAttributes() * Return attribute values for given entities and store * * @param array $entityIds - * @param integer $store_id + * @param int $store_id * @return array */ protected function _getAttributeValues($entityIds, $store_id) @@ -851,7 +848,7 @@ protected function _getAttributeValues($entityIds, $store_id) * * @param string $type * @param array $entityIds - * @param integer $storeId + * @param int $storeId * @return array */ protected function _getAttributeTypeValues($type, $entityIds, $storeId) @@ -879,7 +876,7 @@ protected function _getAttributeTypeValues($type, $entityIds, $storeId) /** * Delete store table(s) of given stores; * - * @param array|integer $stores + * @param array|int $stores * @return $this */ public function deleteStores($stores) @@ -891,7 +888,7 @@ public function deleteStores($stores) /** * Delete table(s) of given stores. * - * @param array|integer $stores + * @param array|int $stores * @return $this */ protected function _deleteTable($stores) @@ -1076,9 +1073,9 @@ public function move(array $affectedCategoryIds) /** * Synchronize flat data with eav after moving category * - * @param integer $categoryId - * @param integer $prevParentId - * @param integer $parentId + * @param int $categoryId + * @param int $prevParentId + * @param int $parentId * @return $this */ public function moveold($categoryId, $prevParentId, $parentId) @@ -1192,7 +1189,7 @@ public function getAttribute($attribute) * * @param Mage_Catalog_Model_Category $category * @param bool $isActiveFlag - * @return integer + * @return int */ public function getChildrenAmount($category, $isActiveFlag = true) { @@ -1208,7 +1205,7 @@ public function getChildrenAmount($category, $isActiveFlag = true) * Get products count in category * * @param Mage_Catalog_Model_Category $category - * @return integer + * @return int */ public function getProductCount($category) { @@ -1318,7 +1315,7 @@ public function getChildrenCategoriesWithInactive($category) * Check is category in list of store categories * * @param Mage_Catalog_Model_Category $category - * @return boolean + * @return bool */ public function isInRootCategoryList($category) { 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..0959b999ecb 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,15 +29,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'; @@ -44,7 +41,7 @@ class Mage_Catalog_Model_Resource_Category_Flat_Collection extends Mage_Core_Mod /** * Store id of application * - * @var integer|null + * @var int|null */ protected $_storeId = null; @@ -120,7 +117,7 @@ public function addIdFilter($categoryIds) /** * Set store id * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -133,7 +130,7 @@ public function setStoreId($storeId) * Return store id. * If store id is not set yet, return store of application * - * @return integer + * @return int */ public function getStoreId() { @@ -371,8 +368,8 @@ public function addOrderField($field) /** * Set collection page start and records to show * - * @param integer $pageNum - * @param integer $pageSize + * @param int $pageNum + * @param int $pageSize * @return $this */ public function setPage($pageNum, $pageSize) 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 47ffe6a5f97..28cce0c47ac 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Resource model for category product indexer * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Category_Indexer_Product extends Mage_Index_Model_Resource_Abstract { @@ -69,10 +70,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'); @@ -317,8 +314,9 @@ public function catalogCategorySave(Mage_Index_Model_Event $event) /** * Reindex not anchor root categories * - * @param array $categoryIds + * @param array|null $categoryIds * @return $this + * @throws Zend_Db_Adapter_Exception */ protected function _refreshNotAnchorRootCategories(array $categoryIds = null) { 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..5379287b8c2 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -49,7 +50,7 @@ class Mage_Catalog_Model_Resource_Category_Tree extends Varien_Data_Tree_Dbp /** * Join URL rewrites data to collection flag * - * @var boolean + * @var bool */ protected $_joinUrlRewriteIntoCollection = false; @@ -63,13 +64,17 @@ class Mage_Catalog_Model_Resource_Category_Tree extends Varien_Data_Tree_Dbp /** * store id * - * @var integer + * @var int */ protected $_storeId = null; + /** + * @var array + */ + protected $_inactiveItems; + /** * Initialize tree - * */ public function __construct() { @@ -90,7 +95,7 @@ public function __construct() /** * Set store id * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -102,7 +107,7 @@ public function setStoreId($storeId) /** * Return store id * - * @return integer + * @return int */ public function getStoreId() { @@ -114,10 +119,10 @@ public function getStoreId() /** * @param Mage_Catalog_Model_Resource_Category_Collection $collection - * @param boolean $sorted + * @param bool $sorted * @param array $exclude - * @param boolean $toLoad - * @param boolean $onlyActive + * @param bool $toLoad + * @param bool $onlyActive * @return $this */ public function addCollectionData( @@ -139,8 +144,9 @@ public function addCollectionData( $nodeIds = []; foreach ($this->getNodes() as $node) { - if (!in_array($node->getId(), $exclude)) { - $nodeIds[] = $node->getId(); + $id = $node->getId(); + if (!in_array($id, $exclude)) { + $nodeIds[] = $id; } } $collection->addIdFilter($nodeIds); @@ -162,9 +168,9 @@ public function addCollectionData( $collection->load(); foreach ($collection as $category) { - if ($this->getNodeById($category->getId())) { - $this->getNodeById($category->getId()) - ->addData($category->getData()); + $node = $this->getNodeById($category->getId()); + if ($node) { + $node->addData($category->getData()); } } @@ -315,7 +321,7 @@ protected function _getInactiveItemIds($collection, $storeId) * Check is category items active * * @param int $id - * @return boolean + * @return bool */ protected function _getItemIsActive($id) { @@ -328,7 +334,7 @@ protected function _getItemIsActive($id) /** * Get categories collection * - * @param boolean $sorted + * @param bool $sorted * @return Mage_Catalog_Model_Resource_Category_Collection */ public function getCollection($sorted = false) @@ -353,14 +359,14 @@ public function setCollection($collection) } /** - * @param boolean $sorted + * @param bool $sorted * @return Mage_Catalog_Model_Resource_Category_Collection */ protected function _getDefaultCollection($sorted = false) { $this->_joinUrlRewriteIntoCollection = true; - $collection = Mage::getModel('catalog/category')->getCollection(); /** @var Mage_Catalog_Model_Resource_Category_Collection $collection */ + $collection = Mage::getModel('catalog/category')->getCollection(); $attributes = Mage::getConfig()->getNode('frontend/category/collection/attributes'); if ($attributes) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php index 11f9bb4b2b9..25b09e86a4f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog EAV collection resource abstract model - * Implement using diferent stores for retrieve attribute values + * Implement using different stores for retrieve attribute values * * @category Mage * @package Mage_Catalog @@ -170,11 +171,7 @@ protected function _addLoadAttributesSelectValues($select, $table, $type) */ protected function _joinAttributeToSelect($method, $attribute, $tableAlias, $condition, $fieldCode, $fieldAlias) { - if (isset($this->_joinAttributes[$fieldCode]['store_id'])) { - $store_id = $this->_joinAttributes[$fieldCode]['store_id']; - } else { - $store_id = $this->getStoreId(); - } + $store_id = $this->_joinAttributes[$fieldCode]['store_id'] ?? $this->getStoreId(); $adapter = $this->getConnection(); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Config.php index cf9e5435539..ee087fbed35 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,10 +42,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'); @@ -53,7 +50,7 @@ protected function _construct() /** * Set store id * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -66,14 +63,11 @@ public function setStoreId($storeId) * Return store id. * If is not set return current app store * - * @return integer + * @return int */ public function getStoreId() { - if ($this->_storeId === null) { - return Mage::app()->getStore()->getId(); - } - return $this->_storeId; + return $this->_storeId ?? Mage::app()->getStore()->getId(); } /** 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..b846a495d8c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,14 +79,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'; @@ -184,7 +181,7 @@ protected function _afterDeleteCommit() /** * Return is attribute global * - * @return integer + * @return int */ public function getIsGlobal() { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php index da586a72076..d745bf1b55c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php index ea4f75dbb4c..fb2b34bfa28 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php index 85bb7f6d4fc..98003940e54 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php index 5833b26d46c..9ae54f61263 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php index dfd855acd10..6a379443c02 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php index f6beff3ae2e..a9c42b16657 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog category landing page attribute source * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Layout extends Mage_Catalog_Model_Resource_Category_Attribute_Source_Layout diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php index d8ef9c6f712..fbf118d59c3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog category landing page attribute source * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Mode extends Mage_Catalog_Model_Resource_Category_Attribute_Source_Mode diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php index 583ec9dfa13..6a06c329639 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog category landing page attribute source * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Attribute_Source_Page extends Mage_Catalog_Model_Resource_Category_Attribute_Source_Page diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php index d5a16575f34..4ea3c27aa4e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php index fd35c55bbbb..1e469f004ca 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php index 84234aff33d..6baad6d42a9 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php index 613f63e87a7..9a0a1568550 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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_Indexer_Product extends Mage_Catalog_Model_Resource_Category_Indexer_Product 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..85868652a8d 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php index 639e03bfd25..acc33112f7b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog EAV collection resource abstract model - * Implement using diferent stores for retrieve attribute values + * Implement using different stores for retrieve attribute values * * @category Mage * @package Mage_Catalog diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php index 59f80d08df8..0c8d33ce84e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php index 73319d459c9..069264427be 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php index 365bf6bfc8f..54ac42dbc14 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php index 8c8f69db376..c532f64f47e 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Layer Price Filter resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Layer_Filter_Price extends Mage_Catalog_Model_Resource_Layer_Filter_Price diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php index f47a556d922..ecb84036b2d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product entity 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 extends Mage_Catalog_Model_Resource_Product diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php index 469123ee920..a1b77f5b31c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php index 819c763dc4c..2170770b021 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php index 00ba6624862..17211e745ca 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product media gallery attribute backend resource * - * @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_Media extends Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media 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..d73bb4a7517 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..f80a11a0a93 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php index 6ef88ef4886..3c3e31d083f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php index f8ca2b0c2f8..5bbf302f750 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..ea96ed00269 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php index 1fe766b6598..04e3cf4e812 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php index a67101c8ae6..57d278b7939 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog compare item 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_Compare_Item extends Mage_Catalog_Model_Resource_Product_Compare_Item diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php index 4785fa7994e..17b23ff48ce 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php index ec945364fff..da5fa74dc68 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php index 02482904e20..774330588dc 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php index 9803c63981e..67248106bab 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php index c3468eb0232..9856162b3aa 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php index 9d998502eef..ae15ba05514 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php index a0273bf1995..04de8823a41 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..3008c12bd68 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php index bdef22716c5..c8698d86fd5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Price Indexer Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team * @deprecated */ class Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price extends Mage_Catalog_Model_Resource_Product_Indexer_Price diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php index 04771e76a3c..83f7a4d0ef3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php index 1246432027e..17830ba8dbd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php index 65b7c3f8dc4..ca042f3e777 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php index 18f3c53e697..6b6fdd291f3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Type Price Indexer interface * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ interface Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Indexer_Price_Interface extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php index 7e4d6beca28..fe4b852fc50 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product link 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_Link extends Mage_Catalog_Model_Resource_Product_Link diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php index a53d2b829b0..705a20eee24 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php index 3b67aa57a53..24f20fa259b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php index 96a5dc9fe05..ce99a08ed52 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 extends Mage_Catalog_Model_Resource_Product_Option diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php index 0bcb8e42dc3..389a8b593e5 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..e29802163c3 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php index 26b93601f67..bc7d1a9912b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php index 9dae02defad..da502aec0e1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Relations 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_Relation extends Mage_Catalog_Model_Resource_Product_Relation 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..45b88626d81 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php index a4562428010..86ca1261d1c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php index 2206e561b5b..50d319a53ae 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php index c5a155dcdb2..6fceb8bdccc 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php index 65dce80e067..e858ea9800c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..484c3bd941c 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sendfriend.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php index 1948ecaf0a7..3b33001ee77 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Eav Sendfriend resource model class * - * @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_Sendfriend extends Mage_Sendfriend_Model_Resource_Sendfriend diff --git a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php index c539dde0da5..638b6304515 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..b6dc98d4db8 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..b7748a7ffbb 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Helper/Mysql4.php b/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php index 93efd940ab2..de0df040040 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php @@ -7,33 +7,33 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Eav Mysql resource helper model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Helper_Mysql4 extends Mage_Eav_Model_Resource_Helper_Mysql4 { - /** * Returns columns for select * * @param string $tableAlias * @param string $eavType - * @return string|array + * @return string */ public function attributeSelectFields($tableAlias, $eavType) { 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..6e1fa5fdfe4 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..4a324cde923 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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 de5eef1adac..7f84beec27f 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Layer Price Filter resource model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Layer_Filter_Price extends Mage_Core_Model_Resource_Db_Abstract { @@ -32,10 +33,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'); @@ -217,7 +214,7 @@ protected function _getPriceExpression($filter, $select, $replaceAlias = true) * @param float $price * @param Mage_Catalog_Model_Layer_Filter_Price $filter * @param bool $decrease - * @return float + * @return string */ protected function _getComparingValue($price, $filter, $decrease = true) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Product.php index 9bf738bd231..b9c3871463f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product entity 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 extends Mage_Catalog_Model_Resource_Abstract { @@ -628,9 +629,9 @@ public function getProductsSku(array $productIds) } /** - * @param Mage_Catalog_Model_Product$object + * @param Mage_Catalog_Model_Product $object * @return array - *@deprecated after 1.4.2.0 + * @deprecated after 1.4.2.0 */ public function getParentProductIds($object) { diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php index b190137a7ce..c7288005db7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..7f9d94b4e06 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Groupprice/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php index 4bde030fa20..1647747c002 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php index 5bc78158043..2c4e66e30ea 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php index b9a00329e7b..f344813f48f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product media gallery attribute backend resource * - * @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_Media extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,9 +35,6 @@ class Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media extends Mage_C private $_attributeId = null; - /** - * Resource initialization - */ protected function _construct() { $this->_init(self::GALLERY_TABLE, 'value_id'); @@ -117,7 +115,7 @@ public function insertGallery($data) /** * Delete gallery value in db * - * @param array|integer $valueId + * @param array|int $valueId * @return $this */ public function deleteGallery($valueId) @@ -151,8 +149,8 @@ public function insertGalleryValueInStore($data) /** * Delete gallery value for store in db * - * @param integer $valueId - * @param integer $storeId + * @param int $valueId + * @param int $storeId * @return $this */ public function deleteGalleryValueInStore($valueId, $storeId) @@ -191,7 +189,7 @@ public function duplicate($object, $newFiles, $originalProductId, $newProductId) $data = [ 'attribute_id' => $object->getAttribute()->getId(), 'entity_id' => $newProductId, - 'value' => (isset($newFiles[$row['value_id']]) ? $newFiles[$row['value_id']] : $row['value']) + 'value' => $newFiles[$row['value_id']] ?? $row['value'] ]; $valueIdMap[$row['value_id']] = $this->insertGallery($data); 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..a485a7f943b 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 81cc666e037..4e15ed23bb6 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php index 7c665235634..6e4e4f11ce4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php index ade19da3025..0cd7681c08c 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..9d4af99c844 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php index d452fddfc55..0180c2fc60f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +26,7 @@ * @package Mage_Catalog * @author Magento Core Team * - * @method Mage_Catalog_Model_Product getItemById(int|string $value) + * @method Mage_Catalog_Model_Product getItemById($value) * @method Mage_Catalog_Model_Product[] getItems() */ class Mage_Catalog_Model_Resource_Product_Collection extends Mage_Catalog_Model_Resource_Collection_Abstract @@ -329,7 +330,6 @@ public function isEnabledFlat() } $storeId = $this->getStoreId(); if (!isset($this->_flatEnabled[$storeId])) { - /** @var Mage_Catalog_Helper_Product_Flat $flatHelper */ $flatHelper = $this->getFlatHelper(); $this->_flatEnabled[$storeId] = $flatHelper->isAccessible() && $flatHelper->isBuilt($storeId); } @@ -578,7 +578,7 @@ protected function _prepareUrlDataObject() * Add collection filters by identifiers * * @param mixed $productId - * @param boolean $exclude + * @param bool $exclude * @return $this */ public function addIdFilter($productId, $exclude = false) @@ -753,11 +753,7 @@ public function getMaxAttributeValue($attribute) ->group('e.entity_type_id'); $data = $this->getConnection()->fetchRow($select); - if (isset($data[$fieldAlias])) { - return $data[$fieldAlias]; - } - - return null; + return $data[$fieldAlias] ?? null; } /** @@ -803,7 +799,7 @@ public function getAttributeValueCountByRange($attribute, $range) * Retrieve product count by some value of attribute * * @param string $attribute - * @return array($value=>$count) + * @return array ($value=>$count) */ public function getAttributeValueCount($attribute) { @@ -1056,10 +1052,7 @@ public function addCountToCategories($categoryCollection) } foreach ($categoryCollection as $category) { - $_count = 0; - if (isset($productCounts[$category->getId()])) { - $_count = $productCounts[$category->getId()]; - } + $_count = $productCounts[$category->getId()] ?? 0; $category->setProductCount($_count); } @@ -1306,7 +1299,7 @@ protected function _addFinalPrice() /** * Retrieve all ids * - * @param boolean $resetCache + * @param bool $resetCache * @return array */ public function getAllIdsCache($resetCache = false) @@ -1827,9 +1820,7 @@ protected function _applyProductLimitations() { Mage::dispatchEvent('catalog_product_collection_apply_limitations_before', [ 'collection' => $this, - 'category_id' => isset($this->_productLimitationFilters['category_id']) - ? $this->_productLimitationFilters['category_id'] - : null, + 'category_id' => $this->_productLimitationFilters['category_id'] ?? null, ]); $this->_prepareProductLimitationFilters(); $this->_productLimitationJoinWebsite(); 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 dfbd9e41571..309a18ddb8c 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog compare item 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_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/Compare/Item/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php index 63eef97bef6..07dbc34d67b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php index bd439d0a9e0..444e20b4531 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -129,7 +130,7 @@ public function getAttributeForSelect($attributeCode) * Retrieve Attribute Sort column name * * @param string $attributeCode - * @return string + * @return string|null */ public function getAttributeSortColumn($attributeCode) { @@ -159,7 +160,7 @@ public function getAllTableColumns() * Check whether the attribute is a real field in entity table * Rewrited for EAV Collection * - * @param integer|string|Mage_Eav_Model_Entity_Attribute_Abstract $attribute + * @param int|string|Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @return bool */ public function isAttributeStatic($attribute) 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..701ed27b652 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,10 +94,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/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php index 9266dedefd9..3da14e5f7ca 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php index 92f9735fdac..a24a813ba88 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php index 1dfaafbdbf1..eeb7154ed20 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..ce4d9a50f70 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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'); @@ -75,9 +72,9 @@ protected function _prepareIndex($entityIds = null, $attributeId = null) . ' AND pds.store_id=cs.store_id', ['value' => $productValueExpression] ) - ->where('pdd.store_id=?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) - ->where('cs.store_id!=?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) - ->where('pdd.attribute_id IN(?)', $attrIds) + ->where('pdd.store_id = ?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) + ->where('cs.store_id != ? AND s.is_active=1', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) + ->where('pdd.attribute_id IN (?)', $attrIds) ->where("{$productValueExpression} IS NOT NULL"); $statusCond = $write->quoteInto('=?', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); 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..351e7fb7e25 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -111,7 +108,7 @@ protected function _prepareSelectIndex($entityIds = null, $attributeId = null) '1 = 1 AND d.store_id = 0', ['entity_id', 'attribute_id', 'value'] ) - ->where('s.store_id != 0'); + ->where('s.store_id != ? AND s.is_active=1', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID); $statusCond = $adapter->quoteInto(' = ?', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); $this->_addAttributeToSelect($subSelect, 'status', 'd.entity_id', 's.store_id', $statusCond); @@ -214,7 +211,7 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu 'pvd.store_id=?', $adapter->getIfNullSql('pvs.store_id', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) ) - ->where('cs.store_id!=?', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) + ->where('cs.store_id != ? AND cs.is_active=1', Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID) ->where('pvd.attribute_id IN(?)', $attrIds); $statusCond = $adapter->quoteInto('=?', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php index 4ebde1c4c03..4e009d28128 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Price Indexer Resource Model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_Model_Resource_Product_Indexer_Price extends Mage_Index_Model_Resource_Abstract { @@ -341,11 +342,7 @@ public function getTypeIndexers() $this->_indexers = []; $types = Mage::getSingleton('catalog/product_type')->getTypesByPriority(); foreach ($types as $typeId => $typeInfo) { - if (isset($typeInfo['price_indexer'])) { - $modelName = $typeInfo['price_indexer']; - } else { - $modelName = $this->_defaultPriceIndexer; - } + $modelName = $typeInfo['price_indexer'] ?? $this->_defaultPriceIndexer; $isComposite = !empty($typeInfo['composite']); $indexer = Mage::getResourceModel($modelName) ->setTypeId($typeId) @@ -505,8 +502,6 @@ protected function _prepareGroupPriceIndex($entityIds = null) /** * Copy relations product index from primary index to temporary index table by parent entity * - * @package array|int $excludeIds - * * @param array|int $parentIds * @param array $excludeIds * @return $this diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php index 2550e8452e3..a2e1e19e694 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php index f46e6786e48..ec2f688e59b 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php index 840abcbb0c8..f806b816795 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php index 4808f21c9bc..2df45856f34 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Type Price Indexer interface * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ interface Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface { 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 c146c9a9965..41aba2e7fe4 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog product link 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_Link extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,9 +35,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/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php index 42ddab4ed55..74c82366b3f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,9 +49,6 @@ class Mage_Catalog_Model_Resource_Product_Link_Collection extends Mage_Core_Mode */ protected $_linkTypeId; - /** - * Resource initialization - */ protected function _construct() { $this->_init('catalog/product_link'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php index 390eca9745c..32e491a89ed 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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 da00a12d927..cb6b47385d6 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 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/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php index eba7a7372b3..ab3f9442e33 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -24,12 +25,11 @@ * @category Mage * @package Mage_Catalog * @author Magento Core Team + * + * @method Mage_Catalog_Model_Product_Option getItemById($value) */ class Mage_Catalog_Model_Resource_Product_Option_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('catalog/product_option'); 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..65281e7a466 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php index ec5b54a229e..74bf105b55a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Catalog_Model_Resource_Product_Option_Value_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('catalog/product_option_value'); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php index 9f9d9da710a..02020487894 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Product Relations 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_Relation extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize resource model and define main table - * - */ protected function _construct() { $this->_init('catalog/product_relation', 'parent_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..2ad88c87b7f 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +35,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'); @@ -57,7 +54,7 @@ public function getProductAttribute($attributeCode) /** * Retrieve product attribute * - * @param string|integer|Mage_Core_Model_Config_Element $attribute + * @param string|int|Mage_Core_Model_Config_Element $attribute * @return Mage_Eav_Model_Entity_Attribute_Abstract */ protected function _getProductAttribute($attribute) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php index 06712d2b95d..2a5372f78c3 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +53,9 @@ public function saveProducts($mainProduct, $productIds) } else { $mainProductId = $mainProduct; } - $old = $mainProduct->getTypeInstance()->getUsedProductIds(); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $mainProduct->getTypeInstance(); + $old = $productType->getUsedProductIds(); $insert = array_diff($productIds, $old); $delete = array_diff($old, $productIds); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php index 541b57041f9..c5f1603e006 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..31f756cc5a2 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,10 +52,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'); @@ -151,8 +148,9 @@ protected function _addProductAttributes() */ public function _addAssociatedProductFilters() { - $this->getProduct()->getTypeInstance(true) - ->getUsedProducts($this->getColumnValues('attribute_id'), $this->getProduct()); //Filter associated products + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + $productType->getUsedProducts($this->getColumnValues('attribute_id'), $this->getProduct()); //Filter associated products return $this; } @@ -239,6 +237,7 @@ protected function _loadPrices() $sortOrder = 1; foreach ($this->_items as $item) { $productAttribute = $item->getProductAttribute(); + $productAttributeCode = $productAttribute->getAttributeCode(); if (!($productAttribute instanceof Mage_Eav_Model_Entity_Attribute_Abstract)) { continue; } @@ -249,12 +248,12 @@ protected function _loadPrices() $optionsByValue[$option['value']] = ['label' => $option['label'], 'order' => $sortOrder++]; } - /** @var Mage_Catalog_Model_Product $associatedProduct */ - foreach ($this->getProduct()->getTypeInstance(true) - ->getUsedProducts([$productAttribute->getAttributeCode()], $this->getProduct()) - as $associatedProduct) { + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->getProduct()->getTypeInstance(true); - $optionValue = $associatedProduct->getData($productAttribute->getAttributeCode()); + /** @var Mage_Catalog_Model_Product $associatedProduct */ + foreach ($productType->getUsedProducts([$productAttributeCode], $this->getProduct()) as $associatedProduct) { + $optionValue = $associatedProduct->getData($productAttributeCode); if (array_key_exists($optionValue, $optionsByValue)) { // If option available in associated product diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php index 51bea5f5d97..069f14cca8d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..311b45e394a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..3e5ba16ba0a 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Setup.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..d19093e51cd 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -793,10 +794,7 @@ public function getCategory($categoryId, $storeId) } $categories = $this->_getCategories($categoryId, $storeId); - if (isset($categories[$categoryId])) { - return $categories[$categoryId]; - } - return false; + return $categories[$categoryId] ?? false; } /** @@ -1015,10 +1013,7 @@ public function getProduct($productId, $storeId) { $entityId = 0; $products = $this->_getProducts($productId, $storeId, 0, $entityId); - if (isset($products[$productId])) { - return $products[$productId]; - } - return false; + return $products[$productId] ?? false; } /** diff --git a/app/code/core/Mage/Catalog/Model/Session.php b/app/code/core/Mage/Catalog/Model/Session.php index 70b9766062d..ceb991a4254 100644 --- a/app/code/core/Mage/Catalog/Model/Session.php +++ b/app/code/core/Mage/Catalog/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Category/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php index 0f461825fd3..9b753c19e06 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php index 33c03fa4ea9..1b4da30c9f9 100644 --- a/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php +++ b/app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..0d6b37d4f1e 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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/Template/Filter.php b/app/code/core/Mage/Catalog/Model/Template/Filter.php index 67b91b0d2e6..1cbfe26f94f 100644 --- a/app/code/core/Mage/Catalog/Model/Template/Filter.php +++ b/app/code/core/Mage/Catalog/Model/Template/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -126,7 +127,7 @@ public function storeDirective($construction) $params['_direct'] = $params['direct_url']; unset($params['direct_url']); } else { - $path = isset($params['url']) ? $params['url'] : ''; + $path = $params['url'] ?? ''; unset($params['url']); } diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index e32a674e2f0..d1a7e048649 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,7 +46,7 @@ class Mage_Catalog_Model_Url /** * Resource model * - * @var Mage_Catalog_Model_Resource_Url. + * @var Mage_Catalog_Model_Resource_Url */ protected $_resourceModel; @@ -151,7 +152,7 @@ public function getStores($storeId = null) /** * Retrieve resource model * - * @return Mage_Catalog_Model_Resource_Url. + * @return Mage_Catalog_Model_Resource_Url */ public function getResource() { @@ -222,10 +223,7 @@ public function setShouldSaveRewritesHistory($flag) */ public function getShouldSaveRewritesHistory($storeId = null) { - if ($this->_saveRewritesHistory !== null) { - return $this->_saveRewritesHistory; - } - return Mage::helper('catalog')->shouldSaveUrlRewritesHistory($storeId); + return $this->_saveRewritesHistory ?? Mage::helper('catalog')->shouldSaveUrlRewritesHistory($storeId); } /** @@ -658,7 +656,7 @@ public function getUnusedPathByUrlKey($storeId, $requestPath, $idPath, $urlKey) return $this->getUnusedPathByUrlKey($storeId, '-', $idPath, $urlKey); } $match['prefix'] = $match['prefix'] . '-'; - $match['suffix'] = isset($match['suffix']) ? $match['suffix'] : ''; + $match['suffix'] = $match['suffix'] ?? ''; $lastRequestPath = $this->getResource() ->getLastUsedRewriteRequestIncrement($match['prefix'], $match['suffix'], $storeId); diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php index 3c1891bca5e..8b9928e8547 100644 --- a/app/code/core/Mage/Catalog/controllers/CategoryController.php +++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/IndexController.php b/app/code/core/Mage/Catalog/controllers/IndexController.php index eeb31586f87..8aa30c82fef 100644 --- a/app/code/core/Mage/Catalog/controllers/IndexController.php +++ b/app/code/core/Mage/Catalog/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php index 1a1bb419e53..725c6a17dac 100644 --- a/app/code/core/Mage/Catalog/controllers/Product/CompareController.php +++ b/app/code/core/Mage/Catalog/controllers/Product/CompareController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/controllers/ProductController.php b/app/code/core/Mage/Catalog/controllers/ProductController.php index 09480f0de7f..a7520179c39 100644 --- a/app/code/core/Mage/Catalog/controllers/ProductController.php +++ b/app/code/core/Mage/Catalog/controllers/ProductController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_Catalog + * @author Magento Core Team */ class Mage_Catalog_ProductController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php index e30cf66cb9c..e3fce4b1586 100644 --- a/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +++ b/app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,10 +24,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/data/catalog_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php index c6f886f4213..ab624c489b1 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php index 8a112c5aea3..60c89a9a831 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php index 8dec7531035..692e4cbb1e8 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php index 2952e9f19c1..1bdf085f75d 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19.1.3-1.6.0.0.19.1.4.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php index a4ad6cb332b..4eb8dccbd25 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php index a9a86ae8536..806b86791b7 100644 --- a/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php +++ b/app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Catalog/etc/adminhtml.xml b/app/code/core/Mage/Catalog/etc/adminhtml.xml index 3558cd88a31..f96341b5028 100644 --- a/app/code/core/Mage/Catalog/etc/adminhtml.xml +++ b/app/code/core/Mage/Catalog/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 58bd404f6b8..5d623a7e262 100644 --- a/app/code/core/Mage/Catalog/etc/api.xml +++ b/app/code/core/Mage/Catalog/etc/api.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. (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/etc/api2.xml b/app/code/core/Mage/Catalog/etc/api2.xml index 859f73644bd..5b60ea30e17 100644 --- a/app/code/core/Mage/Catalog/etc/api2.xml +++ b/app/code/core/Mage/Catalog/etc/api2.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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 a8bb167298f..0060126e00f 100644 --- a/app/code/core/Mage/Catalog/etc/config.xml +++ b/app/code/core/Mage/Catalog/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2017 The OpenMage Contributors (https://www.openmage.org) + * @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 92db098e8f3..ab0edde507a 100644 --- a/app/code/core/Mage/Catalog/etc/convert.xml +++ b/app/code/core/Mage/Catalog/etc/convert.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. (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/etc/system.xml b/app/code/core/Mage/Catalog/etc/system.xml index ca108dfc8d0..ca9325647ad 100644 --- a/app/code/core/Mage/Catalog/etc/system.xml +++ b/app/code/core/Mage/Catalog/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..cb3952911cc 100644 --- a/app/code/core/Mage/Catalog/etc/widget.xml +++ b/app/code/core/Mage/Catalog/etc/widget.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. (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/install-1.6.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php index d337735a3c4..5ec09657ee7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/mysql4-data-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php index 02763b4c5c4..47219fa6f99 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php @@ -7,141 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - -/* -// Modify Groups and Attributes for Category -$entityTypeId = $installer->getEntityTypeId('catalog_category'); -$attributeSetId = $installer->getDefaultAttributeSetId($entityTypeId); -$attributeGroupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId); - -// update General Group -$installer->updateAttributeGroup( - $entityTypeId, - $attributeSetId, - $attributeGroupId, - 'attribute_group_name', - 'General Information' -); -$installer->updateAttributeGroup( - $entityTypeId, - $attributeSetId, - $attributeGroupId, - 'sort_order', - '10' -); - -// Add groups -$groups = array( - 'display' => array( - 'name' => 'Display Settings', - 'sort' => 20, - 'id' => null - ), - 'design' => array( - 'name' => 'Custom Design', - 'sort' => 30, - 'id' => null - ) -); - -foreach ($groups as $k => $groupProp) { - //if ($k == 'display') continue; - //$installer->getConnection()->raw_query("INSERT INTO `eav_attribute_group` (`attribute_group_id`, `attribute_set_id`, `attribute_group_name`, `sort_order`) VALUES (null, ".$attributeSetId.", '".$groupProp['name']."', ".$groupProp['sort'].");"); - $installer->addAttributeGroup($entityTypeId, $attributeSetId, $groupProp['name'], $groupProp['sort']); - $groups[$k]['id'] = $installer->getAttributeGroupId($entityTypeId, $attributeSetId, $groupProp['name']); -} - -// Add Catalog Default Sort Attributes -$installer->addAttribute($entityTypeId, 'available_sort_by', array( - 'input' => 'multiselect', - 'type' => 'text', - 'label' => 'Available Product Listing Sort By', - 'source' => 'catalog/category_attribute_source_sortby', - 'backend' => 'catalog/category_attribute_backend_sortby', - 'required' => 1, - 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, - 'visible' => 1, - 'input_renderer'=> 'adminhtml/catalog_category_helper_sortby_available', -)); -$installer->addAttribute($entityTypeId, 'default_sort_by', array( - 'input' => 'select', - 'label' => 'Default Product Listing Sort By', - 'source' => 'catalog/category_attribute_source_sortby', - 'backend' => 'catalog/category_attribute_backend_sortby', - 'required' => 1, - 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, - 'visible' => 1, - 'input_renderer'=> 'adminhtml/catalog_category_helper_sortby_default', -)); - -// update attributes group and sort -$attributes = array( - 'custom_design' => array( - 'group' => 'design', - 'sort' => 10 - ), - 'custom_design_apply' => array( - 'group' => 'design', - 'sort' => 20 - ), - 'custom_design_from' => array( - 'group' => 'design', - 'sort' => 30 - ), - 'custom_design_to' => array( - 'group' => 'design', - 'sort' => 40 - ), - 'page_layout' => array( - 'group' => 'design', - 'sort' => 50 - ), - 'custom_layout_update' => array( - 'group' => 'design', - 'sort' => 60 - ), - 'display_mode' => array( - 'group' => 'display', - 'sort' => 10 - ), - 'landing_page' => array( - 'group' => 'display', - 'sort' => 20 - ), - 'is_anchor' => array( - 'group' => 'display', - 'sort' => 30 - ), - 'available_sort_by' => array( - 'group' => 'display', - 'sort' => 40 - ), - 'default_sort_by' => array( - 'group' => 'display', - 'sort' => 50 - ), -); - -foreach ($attributes as $attributeCode => $attributeProp) { - $installer->addAttributeToGroup( - $entityTypeId, - $attributeSetId, - $groups[$attributeProp['group']]['id'], - $attributeCode, - $attributeProp['sort'] - ); -} -*/ +$installer = $this; \ No newline at end of file diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php index 88a0f151b68..e424dae21ee 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php @@ -7,42 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); -/* -$installer->addAttribute('catalog_product', 'page_layout', array( - 'type' => 'varchar', - 'backend' => '', - 'frontend' => '', - 'label' => 'Page Layout', - 'input' => 'select', - 'class' => '', - 'source' => 'catalog/product_attribute_source_layout', - 'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE, - 'visible' => true, - 'required' => false, - 'user_defined' => false, - 'default' => '', - 'searchable' => false, - 'filterable' => false, - 'comparable' => false, - 'visible_on_front' => false, - 'unique' => false, - 'group' => 'Design' -)); - -$installer->endSetup(); -*/ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php index 26ad5b7a609..2804f1d2b88 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php @@ -7,87 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; -/* -$installer->startSetup(); - -$entityTypeId = $installer->getEntityTypeId('catalog_category'); -$designApplyAttributeId = $installer->getAttributeId($entityTypeId, 'custom_design_apply'); -$designAttributeId = $installer->getAttributeId($entityTypeId, 'custom_design'); -$catalogCategoryEntityIntTable = $installer->getAttributeTable($entityTypeId, $designApplyAttributeId); -$eavAttributeTable = $installer->getTable('eav/attribute'); - -$installer->addAttribute($entityTypeId, 'custom_use_parent_settings', array( - 'type' => 'int', - 'input' => 'select', - 'label' => 'Use Parent Category Settings', - 'source' => 'eav/entity_attribute_source_boolean', - 'required' => 0, - 'group' => 'Custom Design', - 'sort_order' => '5', - 'global' => 0 -)); -$installer->addAttribute($entityTypeId, 'custom_apply_to_products', array( - 'type' => 'int', - 'input' => 'select', - 'label' => 'Apply To Products', - 'source' => 'eav/entity_attribute_source_boolean', - 'required' => 0, - 'group' => 'Custom Design', - 'sort_order' => '6', - 'global' => 0 -)); -$useParentSettingsAttributeId = $installer->getAttributeId($entityTypeId, 'custom_use_parent_settings'); -$applyToProductsAttributeId = $installer->getAttributeId($entityTypeId, 'custom_apply_to_products'); - - - -$attributeIdExpr = new Zend_Db_Expr( - 'IF (e_a.attribute_id = e.attribute_id,'. - $useParentSettingsAttributeId.', '. - $applyToProductsAttributeId .')'); -$productValueExpr = new Zend_Db_Expr('IF (e.value IN (1,3), 1, 0)'); -$valueExpr = new Zend_Db_Expr('IF (e_a.attribute_id = e.attribute_id, 1, '. $productValueExpr .')'); -$select = $installer->getConnection()->select() - ->from( - array('e' => $catalogCategoryEntityIntTable), - array( - 'entity_type_id', - 'attribute_id' => $attributeIdExpr, - 'store_id', - 'entity_id', - 'value' => $valueExpr - ) - ) - ->joinCross( - array('e_a' => $eavAttributeTable), - array()) - ->where('e_a.attribute_id IN (?)', array($designApplyAttributeId, $designAttributeId)) - ->where('e.attribute_id = ?', $designApplyAttributeId) - ->order(array('e.entity_id', 'attribute_id')); - -$insertArray = array( - 'entity_type_id', - 'attribute_id', - 'store_id', - 'entity_id', - 'value' -); - -$sqlQuery = $select->insertFromSelect($catalogCategoryEntityIntTable, $insertArray, false); -$installer->getConnection()->query($sqlQuery); - -$installer->endSetup(); -*/ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php index 4ae8dbede7c..e73222cf166 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php index 17783063485..6e3de77c0ad 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); if (!$installer->tableExists($installer->getTable('catalog_category_entity'))) { diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php index 00fe2151813..e9aa4b7df55 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); if (!$installer->tableExists($installer->getTable('catalog_category_entity'))) { diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php index b7a86146467..611f235a67b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->deleteConfigData('catalog/category/root_id', 'stores'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php index eece9b32032..1d29bedf1b7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php index ca7cade9a04..ccab959d864 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->addAttributeGroup('catalog_product', 'Default', 'Design', 6); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php index b25584b6d26..76f1afd27eb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->installEntities(); $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php index 5d18521a34e..11d6a27cc6d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -7,17 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->installEntities(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php index b507b19d318..5a3c98c48b3 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $mediaAttributeId = (int) $installer->getAttributeId('catalog_product', 'media_gallery'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php index ad1e656c283..b6de40da4e9 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php @@ -7,16 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + $this->startSetup()->run(" delete link1.* from {$this->getTable('catalog_product_link')} link1 diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php index 89d25653226..be674d12f4b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE `{$installer->getTable('catalog_product_entity')}` CHANGE `type_id` `type_id` VARCHAR(32) DEFAULT 'simple' NOT NULL; @@ -34,4 +35,5 @@ WHEN '5' THEN 'virtual' ELSE `type_id` END; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php index 5d18521a34e..11d6a27cc6d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php @@ -7,17 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->installEntities(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php index ed096de7b05..ef9502f37f2 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_category', 'image', 'backend_model', 'catalog/category_attribute_backend_image'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php index 3104303b61d..ffc42fa0784 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $entityTypeId = (int) $installer->getEntityTypeId('catalog_product'); $installer->run(" UPDATE `{$installer->getTable('eav_attribute')}` diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php index b25584b6d26..76f1afd27eb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->installEntities(); $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php index 3aee298301f..d4d1d4d88b6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php index 90798d29665..d0c96751655 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $attributes = [ $installer->getAttributeId('catalog_product', 'price'), diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php index aca35b44ebe..12b67c80337 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE `{$this->getTable('catalog_product_entity_tier_price')}` MODIFY COLUMN `qty` DECIMAL(12,4) NOT NULL DEFAULT 1; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php index 1f828bf0faf..d022f591d2e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->installEntities(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php index d5aa896ca86..7585aefac86 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->run("UPDATE `{$this->getTable('catalog_category_entity')}` SET `position` = `entity_id` WHERE `position` = 0;"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php index b7b4db75a12..6c1e648cbc7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->installEntities(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php index b7b4db75a12..f3343b74e80 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php @@ -7,18 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->installEntities(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php index 03039c0a019..aa7eff9bd16 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $conn = $installer->getConnection(); $conn->addColumn($installer->getTable('core_url_rewrite'), 'category_id', 'int unsigned NULL AFTER `store_id`'); $conn->addColumn($installer->getTable('core_url_rewrite'), 'product_id', 'int unsigned NULL AFTER `category_id`'); @@ -72,4 +73,5 @@ $installer->getTable('catalog_product_entity'), 'entity_id' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php index 0b53d423a30..962f1d6407a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->run("UPDATE `{$installer->getTable('eav_attribute')}` SET `position` = 1 WHERE `position` = 0 AND `attribute_code` != 'price';"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php index 32215ded5c0..b71c9a849f0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); // status attribute diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php index 18bc662e926..1f37316a312 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php @@ -7,27 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->updateAttribute('catalog_category', 'is_active', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_category', 'image', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_category', 'display_mode', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_category', 'landing_page', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_category', 'page_layout', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_category', 'custom_layout_update', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); - $installer->updateAttribute('catalog_product', 'status', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_WEBSITE); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php index c7d896e6a4b..33a44614da0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php @@ -7,23 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - -$installer = $this; -/** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ -// -//$installer->run(" -// -//update `{$installer->getTable('eav/attribute')}` set `is_required`=0 where `attribute_id`='{$installer->getAttributeId('catalog_product', 'tax_class_id')}' -// -//"); -// diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php index 3359778d19b..2d839988232 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php index a5839a3e0b8..10b5830679f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $attributeId = $installer->getAttributeId('catalog_category', 'is_active'); $entityTypeId = $installer->getEntityTypeId('catalog_category'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php index b8c388e9b16..e52a8acc7d7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $select = $installer->getConnection()->select() diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php index ffac825f5b2..8c8861960ae 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run("ALTER TABLE `{$installer->getTable('catalog_category_entity')}` DROP `is_active`;"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php index 358ec9f3fce..a9110ceee5d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + try { $installer->run(" ALTER TABLE `{$installer->getTable('catalog_category_entity')}` ADD `level` INT NOT NULL; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php index f8e7dd20a69..348cf8a21a2 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + try { $installer->run(" ALTER TABLE `{$installer->getTable('catalog_product_website')}` ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; @@ -38,4 +39,5 @@ "); } catch (Exception $e) { } + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php index 40f38845802..6194cfc2251 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php index 20f5dd08c88..464eed50400 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php index 763138d8720..589ac8bae30 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $fieldList = ['price','special_price','special_from_date','special_to_date', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php index cdd6c329608..1a923333967 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS {$this->getTable('catalog_product_website')}; CREATE TABLE {$this->getTable('catalog_product_website')} ( diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php index 58fbac24fbf..92e033d8846 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $defaultValue = 'container2'; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php index d65c18cd330..4fa6bb4261b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addKey($installer->getTable('catalog_product_entity_int'), 'IDX_ATTRIBUTE_VALUE', ['entity_id', 'attribute_id', 'store_id']); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php index 064a8f8fb3c..f20f0a60b39 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'required_options', [ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php index 03118c69672..ae7a688a77b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_product', 'tax_class_id', 'apply_to', 'simple,configurable,virtual'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php index e3dcfbf9069..b668d81744b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_product', 'tier_price', 'is_used_for_price_rules', '0'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php index 3b0f1c72690..9df9bec70a7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS {$this->getTable('catalog_category_product_index')}; CREATE TABLE `{$installer->getTable('catalog_category_product_index')}` ( diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php index fdb23404e0e..ddaf709876a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php index b05782c35a9..ae5ad0fc7b4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php index 116706eb893..89a589f0824 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $this */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php index 84ac0f36637..98cdfbaee9a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->startSetup(); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php index 9de538d4238..92e713c3347 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $this */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php index baf0f1cbfd8..a160e41b891 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $this */ $this->startSetup(); + $table = $this->getTable('catalog/category'); $tableTmp = $table . "_tmp"; $this->run("DROP TABLE IF EXISTS `{$tableTmp}`"); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php index ff174ce6f1e..27c0addb3c6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->changeColumn($installer->getTable('catalog/product_option_title'), 'title', 'title', 'VARCHAR(255) NOT NULL default \'\''); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php index 1a07240f83d..8fb2301df0a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'image_label', [ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php index bf7be7b1b6d..67c892cd147 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php @@ -7,26 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_product', 'image_label', 'is_searchable', '0'); - $installer->updateAttribute('catalog_product', 'small_image_label', 'is_searchable', '0'); - $installer->updateAttribute('catalog_product', 'thumbnail_label', 'is_searchable', '0'); $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php index 02685216e9a..a255b824c27 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $categoryIndexTable = $installer->getTable('catalog/category_product_index'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php index 1ba7406f06f..83fd5521b0b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $select = $installer->getConnection()->select() diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php index 559f3b08004..17d95c2e53e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->closeConnection(); // Add listing and sort attribute properties diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php index 1bca4a822aa..94b0b0f8024 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php index 4565dbd1c4d..4a539ecf098 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addColumn($installer->getTable('catalog/product_option'), 'image_size_x', 'smallint unsigned not null after `file_extension`'); $installer->getConnection()->addColumn($installer->getTable('catalog/product_option'), 'image_size_y', 'smallint unsigned not null after `image_size_x`'); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php index b25584b6d26..412d40dda10 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->installEntities(); $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php index 18e59181533..defc1ff59ec 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php @@ -7,24 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $tableCatalogProduct = $this->getTable('catalog/product'); - $types = ['datetime', 'decimal', 'int', 'text', 'varchar']; - foreach ($types as $type) { $tableName = $tableCatalogProduct . '_' . $type; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php index 6593ffec5e0..6aad442f6b6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->getConnection()->addKey( diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php index d89a93315b4..6fc485b8f42 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->updateAttribute('catalog_product', 'required_options', 'used_in_product_listing', '1'); $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php index 30a6967a9cf..9650af850d3 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'page_layout', [ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php index b0e6f622294..bbe99aaf5b3 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $connection = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection->addColumn($installer->getTable('catalog/product_super_attribute_pricing'), 'website_id', 'smallint(5) UNSIGNED NOT NULL DEFAULT 0'); @@ -34,4 +35,5 @@ 'cascade', 'cascade' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php index 75d58c71e3c..a12745b1afd 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; Mage::getModel('catalog/product_flat_flag') ->loadSelf() @@ -31,4 +32,5 @@ UPDATE `{$installer->getTable('core/config_data')}` SET `value`=0 WHERE `path` LIKE '".Mage_Catalog_Helper_Product_Flat::XML_PATH_USE_PRODUCT_FLAT."'; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php index cf4992a60aa..aa52845d6fb 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; $installer->addAttribute('catalog_product', 'created_at', [ 'type' => 'static', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php index 2e85d7bb368..fdbfb27a22d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addColumn($installer->getTable('catalog/product'), 'required_options', 'tinyint(1) unsigned NOT NULL default 0'); $entityTypeId = 'catalog_product'; diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php index f4fec6ea501..320e6a4cc27 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + // fix for sample data 1.2.0 $installer->getConnection()->dropForeignKey( $installer->getTable('catalog/product_website'), @@ -103,4 +104,5 @@ 'CASCADE', true ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php index 17cc1037e88..26a582ddfb0 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addColumn( $installer->getTable('catalog/compare_item'), 'store_id', @@ -36,4 +37,5 @@ 'set null', 'cascade' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php index 0ee08fad141..1133a22cd41 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->addAttribute('catalog_product', 'media_gallery', [ 'group' => 'Images', 'label' => 'Media Gallery', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php index f33c19253cf..cbcb6e6588d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php index f2882b084e0..2a97ea5774f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->removeAttribute('catalog_product', 'category_ids'); $installer->getConnection()->dropColumn($installer->getTable('catalog/product'), 'category_ids'); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php index cbae203ff5b..b3a6d10a472 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->dropForeignKey( $installer->getTable('catalog/product_super_attribute_label'), 'FK_SUPER_PRODUCT_ATTRIBUTE_LABEL' @@ -65,4 +66,5 @@ ['product_super_attribute_id', 'store_id'], 'unique' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php index 35cfe3bf60b..d37c014de77 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->updateEntityType('catalog_category', 'additional_attribute_table', 'catalog/eav_attribute'); $installer->updateEntityType('catalog_product', 'additional_attribute_table', 'catalog/eav_attribute'); $installer->updateEntityType('catalog_category', 'entity_attribute_collection', 'catalog/attribute_collection'); @@ -88,4 +89,5 @@ `translate`.store_id != 0 "; $installer->getConnection()->query($sql); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php index 731d6c41950..6f16612095b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,29 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" DROP TABLE IF EXISTS `{$this->getTable('catalog_product_entity_media_gallery_image')}`; "); - $installer->getConnection()->dropColumn($this->getTable('catalog_product_entity_media_gallery'), 'entity_type_id'); - $installer->updateAttribute('catalog_product', 'image', 'frontend_input', 'media_image'); $installer->updateAttribute('catalog_product', 'small_image', 'frontend_input', 'media_image'); $installer->updateAttribute('catalog_product', 'thumbnail', 'frontend_input', 'media_image'); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php index fad68bb31a4..29b04ee631b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->modifyColumn( $installer->getTable('catalog/product') . '_int', 'value', @@ -37,4 +38,5 @@ 'value', 'datetime default NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php index 1f48cd72fa7..9abeb2026ff 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->modifyColumn( $installer->getTable('catalog/category') . '_int', 'value', @@ -37,4 +38,5 @@ 'value', 'datetime default NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php index d263a61a1ff..68f94f89f4b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->updateAttribute( 'catalog_product', 'custom_layout_update', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php index d1554e51cec..ec594264322 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php @@ -7,18 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->updateAttribute('catalog_category', 'url_path', 'is_unique', 0); $installer->updateAttribute('catalog_product', 'url_path', 'is_unique', 0); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php index 1f0e561f3ac..64eb0359218 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('catalog/product_index_eav_decimal')}` ( `entity_id` int(10) unsigned NOT NULL, @@ -38,4 +39,5 @@ CONSTRAINT `FK_CATALOG_PRODUCT_INDEX_EAV_DECIMAL_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core/store')}` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php index 4bc6801d760..873b58ddf4d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->dropKey( $installer->getTable('catalog/product_option_price'), 'IDX_CATALOG_PRODUCT_OPTION_PRICE_SI_OI' diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php index a5847ef641d..703ac30d245 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addColumn( $installer->getTable('catalog/eav_attribute'), 'is_wysiwyg_enabled', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php index 47c74790245..a04db9361a1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php @@ -7,13 +7,13 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php index 1e10362617e..2fe19ecb17a 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php index d4657ce559d..a94ccb061f1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; $installer->startSetup(); + $installer->getConnection()->addKey( $installer->getTable('catalog/product_attribute_tier_price'), 'UNQ_CATALOG_PRODUCT_TIER_PRICE', ['entity_id', 'all_groups', 'customer_group_id', 'qty', 'website_id'], 'unique' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php index 060d2c53e9d..0d99d39f933 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php index 8660a8508dc..e32b94c1b6d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php index 37da1178cbb..dc902dc12cc 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $attributes = [ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php index 3e6f2f2afd0..f753f38f921 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php index 233115393cd..99e0e86828c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php index e38a9c99dcb..bb9078a6072 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; $installer->startSetup(); + $installer->getConnection()->addKey( $installer->getTable('catalog/product_link'), 'IDX_UNIQUE', ['link_type_id', 'product_id', 'linked_product_id'], 'unique' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php index 54f04cc11d6..aa979a5807f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS `{$installer->getTable('catalog/product_index_price')}_idx_cfg_opt_aggregate`; @@ -313,4 +315,5 @@ ) ENGINE=MEMORY DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php index 82469f94e12..254376fce05 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php index 50fb34e433e..c0cb9bf9daf 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php index 87ce6aa8909..0a4caf0d91d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $productEntityTypeId = $installer->getEntityTypeId('catalog_product'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php index c563dfadbc6..77b1c57e608 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php index f93bc6d7484..f76d26e5f19 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); $entityTypeId = $installer->getEntityTypeId('catalog_category'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php index b1c9c2f2ae7..ed32c46b2b6 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->updateEntityType('catalog_category', 'entity_attribute_collection', 'catalog/category_attribute_collection'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php index ea1535d8b5c..352b4367cc2 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->addAttribute('catalog_category', 'filter_price_range', [ 'group' => 'Display Settings', 'type' => 'int', diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php index 6b20d04b627..42234cfc7a1 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $connection = $installer->getConnection(); $indexTable = $installer->getTable('catalog/category_product_index'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php index 014e99a28f3..7beca82f8d5 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $categoryEntityTypeId = $installer->getEntityTypeId('catalog_category'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php index aa1e781e3c5..1e03ec89fc4 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->removeAttribute('catalog_category', 'custom_design_apply'); // the fix for a typo that was in mysql4-upgrade-0.7.71-0.7.72 line 32 diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php index d9ba3ad4308..d4b3827add8 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php index 6c403d8fc7c..ad2cf93be5e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php index 8b55d3dcad4..6391a15b338 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php index 374bea6c326..91cbe7e9ccc 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php index e9ab923ac4c..709beeca10d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php index d755c5e2625..1b960515c2d 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php index 70b3b69a6e9..588cb863c8e 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $groupedLinkType = Mage_Catalog_Model_Product_Link::LINK_TYPE_GROUPED; $installer->run(" @@ -63,4 +64,5 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php index b73747c804e..6e063c7f70f 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php index a10e1535140..4c6fd3c0134 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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(); $table = $installer->getTable('catalog/product_super_attribute_pricing'); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php index 4ae4bccccb1..ec6a92eb0fc 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php index 8b441e3a561..c78c6f6a4c7 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('catalog/product_index_price')}` ( @@ -42,4 +43,5 @@ ) ENGINE=INNODB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php index ea0a485ade9..bad9d50571c 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->updateAttribute($installer->getEntityTypeId('catalog_category'), 'is_active', 'is_required', true); $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php index c85d5d73a7e..d0115542c40 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->updateAttribute('catalog_category', 'url_key', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_category', 'url_path', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); - $installer->updateAttribute('catalog_product', 'url_key', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); $installer->updateAttribute('catalog_product', 'url_path', 'is_global', Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php index 32025d8cd18..509e6fb75bc 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addColumn( $installer->getTable('catalog/product_index_price'), 'final_price', @@ -32,4 +33,5 @@ 'tier_price', 'DECIMAL(12,4) DEFAULT NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php index 2e597b421af..82f16c47468 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ diff --git a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index e329adf522c..a3cc176d40b 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php index 1226684725f..5d0196cc7ee 100644 --- a/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php +++ b/app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installFile = dirname(__FILE__) . DS . 'upgrade-1.6.0.0.8-1.6.0.0.9.php'; +$installFile = __DIR__ . DS . 'upgrade-1.6.0.0.8-1.6.0.0.9.php'; if (file_exists($installFile)) { include $installFile; } /** @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; + /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection = $installer->getConnection(); + $memoryTables = [ 'catalog/category_anchor_indexer_tmp', 'catalog/category_anchor_products_indexer_tmp', 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..9644b0fc653 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 @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5fc5b538925 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..8940281f8ef 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..608acc11673 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c1f8f520932 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 @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..8be630cfdeb 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..620abe3e0ae 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..de2a56834f3 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..235357fbfd1 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 @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..c213494c8ef 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6191d9e5a03 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2731b811f2f 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..37e60e50115 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 @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..dc73f71d6ed 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..3346fe4727c 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 @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..e72a5967b11 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..91cfc882583 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..80d5f2bb123 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Catalog + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php index ad55bb1be87..70890829e68 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,9 +41,6 @@ class Mage_CatalogIndex_Model_Aggregation extends Mage_Core_Model_Abstract { const CACHE_FLAG_NAME = 'layered_navigation'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('catalogindex/aggregation'); diff --git a/app/code/core/Mage/CatalogIndex/Model/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Attribute.php index d160b1cd140..0ac34e1c7f1 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php index 742c78aa567..30ee3c98521 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php index 46026eb3e4b..c3a5ecfd469 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +++ b/app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php index 48f1a7f049e..2f6aa154ef1 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -53,7 +54,7 @@ class Mage_CatalogIndex_Model_Data_Abstract extends Mage_Core_Model_Abstract /** * Defines when product type has parents * - * @var boolean + * @var bool */ protected $_haveParents = true; diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php index 29d7b740d26..f22a4c38dbb 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,7 +42,7 @@ class Mage_CatalogIndex_Model_Data_Configurable extends Mage_CatalogIndex_Model_ /** * Defines when product type has parents * - * @var boolean + * @var bool */ protected $_haveParents = false; diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php index a0b61cd4e43..9d664f87586 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +31,7 @@ class Mage_CatalogIndex_Model_Data_Grouped extends Mage_CatalogIndex_Model_Data_ /** * Defines when product type has parents * - * @var boolean + * @var bool */ protected $_haveParents = false; @@ -65,15 +66,15 @@ public function getTypeCode() /** * Get child link table and field settings * - * @return mixed + * @return array */ protected function _getLinkSettings() { return [ - 'table'=>'catalog/product_link', - 'parent_field'=>'product_id', - 'child_field'=>'linked_product_id', - 'additional'=> ['link_type_id'=>Mage_Catalog_Model_Product_Link::LINK_TYPE_GROUPED] + 'table'=>'catalog/product_link', + 'parent_field'=>'product_id', + 'child_field'=>'linked_product_id', + 'additional'=> ['link_type_id' => Mage_Catalog_Model_Product_Link::LINK_TYPE_GROUPED] ]; } } diff --git a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php index b1fdcd95016..3006a1d85d3 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Simple.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +32,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..a43514be6b3 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +++ b/app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index 7e27a214bbf..41341d8f6e8 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -293,7 +294,7 @@ public function plainReindex($products = null, $attributes = null, $stores = nul $collection = $this->_getProductCollection($store, $products); $collection->addAttributeToFilter( 'status', - ['in'=>Mage::getModel('catalog/product_status')->getSaleableStatusIds()] + ['in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds()] ); $collection->addFieldToFilter('type_id', $type); $this->_walkCollection($collection, $store, [], $priceAttributeCodes); diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php index 8f6b9762635..bae3ae2f84b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,11 +41,15 @@ public function processAfterSave(Mage_Catalog_Model_Product $object, $forceId = $associated = []; switch ($object->getTypeId()) { case Mage_Catalog_Model_Product_Type::TYPE_GROUPED: - $associated = $object->getTypeInstance(true)->getAssociatedProducts($object); + /** @var Mage_Catalog_Model_Product_Type_Grouped $productType */ + $productType = $object->getTypeInstance(true); + $associated = $productType->getAssociatedProducts($object); break; case Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE: - $associated = $object->getTypeInstance(true)->getUsedProducts(null, $object); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $object->getTypeInstance(true); + $associated = $productType->getUsedProducts(null, $object); break; } diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php index 7d3853ecc45..8a839675ace 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,7 +47,7 @@ protected function _construct() /** * @param Mage_Catalog_Model_Product $object * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute - * @return array|mixed + * @return array */ public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) { @@ -90,7 +91,7 @@ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstrac } /** - * @return array|string + * @return string */ protected function _getIndexableAttributeConditions() { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php index 001982adcbb..0579e9c59b9 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php index 9a2e38a77cf..309db7e9f23 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog indexer price processor * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @property Mage_Directory_Model_Currency $_currencyModel * * @method Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice _getResource() @@ -36,10 +41,6 @@ * @method $this setTaxClassId(int $value) * @method int getWebsiteId() * @method $this setWebsiteId(int $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Indexer_Abstract { @@ -95,7 +96,9 @@ public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Mod $priceAttributeId = $this->getTierPriceAttribute()->getId(); if ($object->isGrouped()) { $priceAttributeId = $this->getPriceAttribute()->getId(); - $associated = $object->getTypeInstance(true)->getAssociatedProducts($object); + /** @var Mage_Catalog_Model_Product_Type_Grouped $productType */ + $productType = $object->getTypeInstance(true); + $associated = $productType->getAssociatedProducts($object); $searchEntityId = []; foreach ($associated as $product) { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php index 6623112d62b..5151711f0be 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog indexer price processor * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @method Mage_CatalogIndex_Model_Resource_Indexer_Price _getResource() * @method Mage_CatalogIndex_Model_Resource_Indexer_Price getResource() * @method Mage_CatalogIndex_Model_Indexer_Price setEntityId(int $value) @@ -40,10 +45,6 @@ * @method Mage_CatalogIndex_Model_Indexer_Price setMaxPrice(float $value) * @method float getTierPrice() * @method Mage_CatalogIndex_Model_Indexer_Price setTierPrice(float $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Indexer_Price extends Mage_CatalogIndex_Model_Indexer_Abstract { @@ -59,7 +60,7 @@ protected function _construct() /** * @param Mage_Catalog_Model_Product $object * @param Mage_Eav_Model_Entity_Attribute_Abstract|null $attribute - * @return array|mixed + * @return array */ public function createIndexData(Mage_Catalog_Model_Product $object, Mage_Eav_Model_Entity_Attribute_Abstract $attribute = null) { @@ -106,7 +107,7 @@ protected function _isAttributeIndexable(Mage_Eav_Model_Entity_Attribute_Abstrac } /** - * @return array|string + * @return string */ protected function _getIndexableAttributeConditions() { diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php index 275189f2e06..453c582609a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +49,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/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php index ad64e0d1560..c64bfca358e 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php index 2d485daa202..a9fc030c702 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php index da975889cf1..0ae8909816c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php index 001822c11cf..03ab18dfce8 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php index 6ba7bd5e9f7..29cc5007537 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php index dc7a525a5fa..9ff5302f855 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php index b0c676e37b4..cbedd390234 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php index 2e61f7b3205..f4f0c1d8e0b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php index 584db8e5b1c..934a5efa955 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php index e3044acdf8e..00d9b82802f 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price indexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php index af11c2b8347..caf22c0cd5b 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price indexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Indexer_Price extends Mage_CatalogIndex_Model_Resource_Indexer_Price diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php index ef40e96ba5e..81c86988e82 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price index resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Price extends Mage_CatalogIndex_Model_Resource_Price diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php index ce0cdf7842c..e06da48222f 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Index type retriever resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team * @deprecated */ class Mage_CatalogIndex_Model_Mysql4_Retreiver extends Mage_CatalogIndex_Model_Resource_Retreiver diff --git a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php index 8e8e7ef7221..292aa3805b8 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/CatalogIndex/Model/Observer.php index 9d4e1871510..026e7380809 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Observer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Observer.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Event observer and indexer running application * - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Observer extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Price.php b/app/code/core/Mage/CatalogIndex/Model/Price.php index 652fc519fcd..479916dc9a9 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Price.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price index model * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @method Mage_CatalogIndex_Model_Resource_Price _getResource() * @method Mage_CatalogIndex_Model_Resource_Price getResource() * @method $this setEntityId(int $value) @@ -40,10 +45,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_Price extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php index bf4fbc21c59..65efc3e7a64 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php index e59c32fa1c3..da71eb7f59a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php index 8f8f3477db8..d150bbfa016 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php index 29b27db5caf..5190817209c 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php index 884034ea0f5..1bda3f419a4 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php index 05e9ed985d9..4a287ca53e5 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php index 7bfef9412ac..eb8d752e68e 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php index c0d3d0b2000..e36bcd768f2 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php index d2aa69f87b6..e2db7bc8a85 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php index 00c6c23fcb6..0466aa1ebe7 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price indexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Indexer_Minimalprice extends Mage_CatalogIndex_Model_Resource_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php index 1436b8adf3f..55f719b494a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price indexer resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Indexer_Price extends Mage_CatalogIndex_Model_Resource_Indexer_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php index 766dfa20d60..830b07f7a4a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Price index resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Price extends Mage_CatalogIndex_Model_Resource_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php index f806453c470..5c68b38dc88 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Index type retriever resource model * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team */ class Mage_CatalogIndex_Model_Resource_Retreiver extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php index 504a1b3fd58..44de9e6ff4a 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +++ b/app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Model/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php index b68ffb9344b..0d4ad0f65aa 100644 --- a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php +++ b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Index data retriever factory * + * @category Mage + * @package Mage_CatalogIndex + * @author Magento Core Team + * * @method Mage_CatalogIndex_Model_Resource_Retreiver _getResource() * @method Mage_CatalogIndex_Model_Resource_Retreiver getResource() * @method int getEntityTypeId() @@ -39,10 +44,6 @@ * @method Mage_CatalogIndex_Model_Retreiver setCreatedAt(string $value) * @method string getUpdatedAt() * @method Mage_CatalogIndex_Model_Retreiver setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_CatalogIndex - * @author Magento Core Team */ class Mage_CatalogIndex_Model_Retreiver extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/CatalogIndex/etc/config.xml b/app/code/core/Mage/CatalogIndex/etc/config.xml index f34f3be1253..47b422ef4be 100644 --- a/app/code/core/Mage/CatalogIndex/etc/config.xml +++ b/app/code/core/Mage/CatalogIndex/etc/config.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_CatalogIndex - * @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_CatalogIndex + * @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/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php index 8ff80ff922c..888aca92787 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogIndex - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php index 4638f06d0f5..eefe05642a9 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php index 7bab0c0692d..7709463e2b6 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->dropForeignKey($installer->getTable('catalogindex_price'), 'FK_CATALOGINDEX_PRICE_CUSTOMER_GROUP'); + $installer->endSetup(); diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php index f3a1d1db777..2fcc76699f1 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) - */ - -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ - -$installer->startSetup(); -//Mage::getModel('catalogindex/observer')->reindexAll(); -$installer->endSetup(); + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ \ No newline at end of file diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php index 7459a6dea79..ca425ae165e 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('catalogindex_minimal_price')}` ( `index_id` int(10) unsigned NOT NULL auto_increment, diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php index 1d55295de84..9dcf4314081 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,27 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" TRUNCATE {$installer->getTable('catalogindex_eav')}; TRUNCATE {$installer->getTable('catalogindex_price')}; TRUNCATE {$installer->getTable('catalogindex_minimal_price')}; "); -//Mage::getModel('catalogindex/indexer')->plainReindex(); - $installer->endSetup(); diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php index 6cb2dfbbe6e..c2107d3c169 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" CREATE TABLE `{$installer->getTable('catalogindex_eav_tmp')}` ( diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php index 9ab552797da..6133aaa4087 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addConstraint( diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php index 5c54ce48f94..447b52252c2 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php index 7167a87fd71..dc7570a6e77 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_CatalogIndex_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('catalogindex_price'), 'website_id', 'smallint(5) unsigned'); diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php index edbc9dbe38e..ca42c263b29 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->dropColumn($installer->getTable('catalogindex_price'), 'store_id'); diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php index 235445a943e..696306cff38 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index eddc21d8f2c..eec5cbfcd78 100644 --- a/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,183 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogIndex + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->dropForeignKey( - $installer->getTable('catalog_product_index_eav'), - 'FK_CATALOG_PRODUCT_INDEX_EAV_ATTRIBUTE' -); - -$connection = $installer->getConnection()->dropForeignKey( - $installer->getTable('catalog_product_index_eav'), - 'FK_CATALOG_PRODUCT_INDEX_EAV_ENTITY' -); - -$connection = $installer->getConnection()->dropForeignKey( - $installer->getTable('catalog_product_index_eav'), - 'FK_CATALOG_PRODUCT_INDEX_EAV_STORE' -); - -$connection = $installer->getConnection()->addForeignKey( - $installer->getFkName('catalog_product_index_eav', 'attribute_id', 'eav_attribute', 'attribute_id'), - $installer->getTable('catalog_product_index_eav'), - 'attribute_id', - $installer->getTable('eav_attribute'), - 'attribute_id' -); - -$connection = $installer->getConnection()->addForeignKey( - $installer->getFkName('catalog_product_index_eav', 'entity_id', 'catalog_product_entity', 'entity_id'), - $installer->getTable('catalog_product_index_eav'), - 'entity_id', - $installer->getTable('catalog_product_entity'), - 'entity_id' -); - -$connection = $installer->getConnection()->addForeignKey( - $installer->getFkName('catalog_product_index_eav', 'store_id', 'core_store', 'store_id'), - $installer->getTable('catalog_product_index_eav'), - 'store_id', - $installer->getTable('core_store'), - 'store_id' -); - -$connection = $installer->getConnection()->dropForeignKey( - $installer->getTable('catalog_product_index_price'), - 'FK_CATALOG_PRODUCT_INDEX_PRICE_CUSTOMER_GROUP' -); - -$connection = $installer->getConnection()->dropForeignKey( - $installer->getTable('catalog_product_index_price'), - 'FK_CATALOG_PRODUCT_INDEX_PRICE_ENTITY' -); - -$connection = $installer->getConnection()->dropForeignKey( - $installer->getTable('catalog_product_index_price'), - 'FK_CATALOG_PRODUCT_INDEX_PRICE_WEBSITE' -); - -$connection = $installer->getConnection()->addForeignKey( - $installer->getFkName('catalog_product_index_price', 'customer_group_id', 'customer_group', 'customer_group_id'), - $installer->getTable('catalog_product_index_price'), - 'customer_group_id', - $installer->getTable('customer_group'), - 'customer_group_id' -); - -$connection = $installer->getConnection()->addForeignKey( - $installer->getFkName('catalog_product_index_price', 'entity_id', 'catalog_product_entity', 'entity_id'), - $installer->getTable('catalog_product_index_price'), - 'entity_id', - $installer->getTable('catalog_product_entity'), - 'entity_id' -); - -$connection = $installer->getConnection()->addForeignKey( - $installer->getFkName('catalog_product_index_price', 'website_id', 'core_website', 'website_id'), - $installer->getTable('catalog_product_index_price'), - 'website_id', - $installer->getTable('core_website'), - 'website_id' -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_eav'), - 'IDX_ENTITY' -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_eav'), - 'IDX_ATTRIBUTE' -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_eav'), - 'IDX_STORE' -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_eav'), - 'IDX_VALUE' -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_eav'), - $installer->getIdxName('catalog_product_index_eav', array('entity_id')), - array('entity_id'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_eav'), - $installer->getIdxName('catalog_product_index_eav', array('attribute_id')), - array('attribute_id'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_eav'), - $installer->getIdxName('catalog_product_index_eav', array('store_id')), - array('store_id'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_eav'), - $installer->getIdxName('catalog_product_index_eav', array('value')), - array('value'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_price'), - 'IDX_CUSTOMER_GROUP' -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_price'), - 'IDX_WEBSITE' -); - -$connection = $installer->getConnection()->dropIndex( - $installer->getTable('catalog_product_index_price'), - 'IDX_MIN_PRICE' -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_price'), - $installer->getIdxName('catalog_product_index_price', array('customer_group_id')), - array('customer_group_id'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_price'), - $installer->getIdxName('catalog_product_index_price', array('website_id')), - array('website_id'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -$connection = $installer->getConnection()->addIndex( - $installer->getTable('catalog_product_index_price'), - $installer->getIdxName('catalog_product_index_price', array('min_price')), - array('min_price'), - Varien_Db_Adapter_Interface::INDEX_TYPE_INDEX -); - -*/ -$installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php index d2c8a9f8bdd..82096438371 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php +++ b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +59,7 @@ protected function _getCustomerGroups($groupId = null) } } if (!is_null($groupId)) { - return isset($this->_customerGroups[$groupId]) ? $this->_customerGroups[$groupId] : null; + return $this->_customerGroups[$groupId] ?? null; } return $this->_customerGroups; } diff --git a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php index 8d67af3c787..827ea471c89 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php b/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php index a615c7a31ca..0fa34b7404b 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php +++ b/app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @author Magento Core Team + * @author Magento Core Team */ class Mage_CatalogInventory_Block_Qtyincrements extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php index 793d1ab1b9a..92f72533f50 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php index e014eac543e..c9f443267fd 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php index f6b8f034224..eaa4dcf66c0 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php index 43febe9981b..492f4d99924 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +35,8 @@ class Mage_CatalogInventory_Block_Stockqty_Type_Configurable extends Mage_Catalo */ protected function _getChildProducts() { - return $this->_getProduct()->getTypeInstance(true) - ->getUsedProducts(null, $this->_getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + return $productType->getUsedProducts(null, $this->_getProduct()); } } diff --git a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php index 6d62b658514..edccf8b0693 100644 --- a/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,7 +35,8 @@ class Mage_CatalogInventory_Block_Stockqty_Type_Grouped extends Mage_CatalogInve */ protected function _getChildProducts() { - return $this->_getProduct()->getTypeInstance(true) - ->getAssociatedProducts($this->_getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Grouped $productType */ + $productType = $this->_getProduct()->getTypeInstance(true); + return $productType->getAssociatedProducts($this->_getProduct()); } } diff --git a/app/code/core/Mage/CatalogInventory/Helper/Data.php b/app/code/core/Mage/CatalogInventory/Helper/Data.php index 29b61ef4dd5..64c51676e79 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Data.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Data.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -38,6 +39,8 @@ class Mage_CatalogInventory_Helper_Data extends Mage_Core_Helper_Abstract const ERROR_QTY = 1; const ERROR_QTY_INCREMENTS = 2; + protected $_moduleName = 'Mage_CatalogInventory'; + /** * All product types registry in scope of quantity availability * @@ -54,10 +57,7 @@ class Mage_CatalogInventory_Helper_Data extends Mage_Core_Helper_Abstract public function isQty($productTypeId) { $this->getIsQtyTypeIds(); - if (!isset(self::$_isQtyTypeIds[$productTypeId])) { - return false; - } - return self::$_isQtyTypeIds[$productTypeId]; + return self::$_isQtyTypeIds[$productTypeId] ?? false; } /** diff --git a/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php index c65577b076e..13e160aa179 100644 --- a/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php @@ -7,22 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * MinSaleQty value manipulation helper + * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Helper_Minsaleqty { + protected $_moduleName = 'Mage_CatalogInventory'; + /** * Retrieve fixed qty value * diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php index d81e50bcf58..b99d53724ff 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php index ef1b14c81da..f4c00c47118 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,7 +48,7 @@ protected function _retrieve() protected function _retrieveCollection() { $data = $this->_getCollectionForRetrieve()->load()->toArray(); - return isset($data['items']) ? $data['items'] : $data; + return $data['items'] ?? $data; } /** @@ -117,7 +118,7 @@ protected function _multiUpdate(array $data) if (!$validator->isValidSingleItemDataForMultiUpdate($itemData)) { foreach ($validator->getErrors() as $error) { $this->_errorMessage($error, Mage_Api2_Model_Server::HTTP_BAD_REQUEST, [ - 'item_id' => isset($itemData['item_id']) ? $itemData['item_id'] : null + 'item_id' => $itemData['item_id'] ?? null ]); } $this->_critical(self::RESOURCE_DATA_PRE_VALIDATION_ERROR); @@ -137,7 +138,7 @@ protected function _multiUpdate(array $data) // pre-validation errors are already added if ($e->getMessage() != self::RESOURCE_DATA_PRE_VALIDATION_ERROR) { $this->_errorMessage($e->getMessage(), $e->getCode(), [ - 'item_id' => isset($itemData['item_id']) ? $itemData['item_id'] : null + 'item_id' => $itemData['item_id'] ?? null ]); } } catch (Exception $e) { @@ -145,7 +146,7 @@ protected function _multiUpdate(array $data) Mage_Api2_Model_Resource::RESOURCE_INTERNAL_ERROR, Mage_Api2_Model_Server::HTTP_INTERNAL_ERROR, [ - 'item_id' => isset($itemData['item_id']) ? $itemData['item_id'] : null + 'item_id' => $itemData['item_id'] ?? null ] ); } 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..040b7e24553 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php index 28230a9fb76..36988c49144 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..0956288b5cc 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +38,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 +82,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..a1427bf1771 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Indexer/Stock/Configurable.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php index 0dfaa1de12e..1336bdffd72 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php index 277b42c4efe..cc51b944738 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php index a2f75a2bea0..28d0c914695 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php index da5ee1d6df9..33216c50ac1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogInventory Stock Indexer Interface * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ interface Mage_CatalogInventory_Model_Mysql4_Indexer_Stock_Interface extends Mage_CatalogInventory_Model_Resource_Indexer_Stock_Interface { diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php index af17464e30f..3993e20eec4 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Item.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php index 27a7a754d1a..c40fe206d08 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Stock item 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_Item extends Mage_CatalogInventory_Model_Resource_Stock_Item diff --git a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php index 25ee3d23f81..6c12a17c9a7 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..502e28f676f 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php index 20c9d183ef3..b5ab29c1d7b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Observer.php +++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_CatalogInventory - * @author Magento Core Team + * @author Magento Core Team */ class Mage_CatalogInventory_Model_Observer { 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..dc010f3e6ed 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +43,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'); @@ -259,11 +256,7 @@ protected function _getTypeIndexers() $this->_indexers = []; $types = Mage::getSingleton('catalog/product_type')->getTypesByPriority(); foreach ($types as $typeId => $typeInfo) { - if (isset($typeInfo['stock_indexer'])) { - $modelName = $typeInfo['stock_indexer']; - } else { - $modelName = $this->_defaultIndexer; - } + $modelName = $typeInfo['stock_indexer'] ?? $this->_defaultIndexer; $isComposite = !empty($typeInfo['composite']); $indexer = Mage::getResourceModel($modelName) ->setTypeId($typeId) diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php index ff503c7fd50..b0ae4c4cfa5 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..6434e7f6189 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,10 +42,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/Indexer/Stock/Grouped.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php index a3aa50c801d..7c833822fc1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php index 483f9738d1d..3f7beffdd4b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogInventory Stock Indexer Interface * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ interface Mage_CatalogInventory_Model_Resource_Indexer_Stock_Interface { diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php index 8f8c6a07542..57691989fd6 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php @@ -7,44 +7,45 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** * Is initialized configuration flag * - * @var boolean + * @var bool */ protected $_isConfig; /** * Manage Stock flag * - * @var boolean + * @var bool */ protected $_isConfigManageStock; /** * Backorders * - * @var boolean + * @var bool */ protected $_isConfigBackorders; @@ -76,10 +77,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 a9b0552fefc..c4203d88a4b 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Stock item 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_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table and initialize connection - * - */ protected function _construct() { $this->_init('cataloginventory/stock_item', 'item_id'); @@ -102,7 +99,7 @@ public function addCatalogInventoryToProductCollection($productCollection) /** * Use qty correction for qty column update * - * @param Varien_Object|Mage_CatalogInventory_Model_Stock_Item $object + * @param Mage_CatalogInventory_Model_Stock_Item $object * @param string $table * @return array */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php index abc112e380e..61fad0fb4a1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_CatalogInventory_Model_Resource_Stock_Item_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cataloginventory/stock_item'); @@ -99,7 +96,7 @@ public function joinStockStatus($storeId = null) /** * Add Managed Stock products filter to collection * - * @param boolean $isStockManagedInConfig + * @param bool $isStockManagedInConfig * @return $this */ public function addManagedFilter($isStockManagedInConfig) 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..98a0d756cbe 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Backorders.php b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php index 6744e96c274..b44d476f797 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php index 13924beba63..9f7937d700d 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Source/Stock.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,8 +29,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..7241a61c1cb 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock.php @@ -7,28 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php index 6973e049aa5..8d13b11d119 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Inventory Stock Model * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team + * * @method Mage_CatalogInventory_Model_Resource_Stock_Item _getResource() * @method Mage_CatalogInventory_Model_Resource_Stock_Item getResource() * @method Mage_CatalogInventory_Model_Resource_Stock_Item_Collection getCollection() @@ -84,10 +89,6 @@ * @method $this setStockQty(float $value) * @method bool hasStockQty() * @method float getQtyCorrection() - * - * @category Mage - * @package Mage_CatalogInventory - * @author Magento Core Team */ class Mage_CatalogInventory_Model_Stock_Item extends Mage_Core_Model_Abstract { @@ -154,10 +155,6 @@ class Mage_CatalogInventory_Model_Stock_Item extends Mage_Core_Model_Abstract */ protected $_processIndexEvents = true; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cataloginventory/stock_item'); diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php index 4c676bd9d9c..9e41417b6a1 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..1366e2c79bc 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 @@ -7,20 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 @@ -64,7 +67,7 @@ public function update($productId, $data) * * @param array $productIds * @param array $productData - * @return boolean + * @return bool */ public function multiUpdate($productIds, $productData) { diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php index c2c3ef3e67e..3ac0924fca4 100644 --- a/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Status.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +38,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 { @@ -96,10 +97,7 @@ public function getProductTypeInstances() public function getProductTypeInstance($productType) { $types = $this->getProductTypeInstances(); - if (isset($types[$productType])) { - return $types[$productType]; - } - return false; + return $types[$productType] ?? false; } /** @@ -131,10 +129,7 @@ public function getWebsites($websiteId = null) public function getWebsiteDefaultStoreId($websiteId) { $websites = $this->getWebsites(); - if (isset($websites[$websiteId])) { - return $websites[$websiteId]; - } - return 0; + return $websites[$websiteId] ?? 0; } /** @@ -202,7 +197,7 @@ public function assignProduct(Mage_Catalog_Model_Product $product, $stockId = 1, if (is_null($stockStatus)) { $websiteId = $product->getStore()->getWebsiteId(); $status = $this->getProductStatus($product->getId(), $websiteId, $stockId); - $stockStatus = isset($status[$product->getId()]) ? $status[$product->getId()] : null; + $stockStatus = $status[$product->getId()] ?? null; } $product->setIsSalable($stockStatus); @@ -363,7 +358,7 @@ protected function _processParents($productId, $stockId = 1, $websiteId = null) $item = $this->getStockItemModel(); foreach ($parentIds as $parentId) { - $parentType = isset($productTypes[$parentId]) ? $productTypes[$parentId] : null; + $parentType = $productTypes[$parentId] ?? null; $item->setData(['stock_id' => $stockId]) ->setOrigData() ->loadByProduct($parentId); @@ -432,10 +427,7 @@ public function getProductData($productIds, $websiteId, $stockId = 1) public function getProductType($productId) { $types = $this->getResource()->getProductsType($productId); - if (isset($types[$productId])) { - return $types[$productId]; - } - return false; + return $types[$productId] ?? false; } /** diff --git a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php index 27a968a6b69..bdd511dc486 100644 --- a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php +++ b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php index c9ea5c80b57..329076e62ad 100644 --- a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php +++ b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php @@ -7,35 +7,42 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Backend for serialized array data * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Model_System_Config_Backend_Minsaleqty extends Mage_Core_Model_Config_Data { /** * Process data after load + * @return $this */ protected function _afterLoad() { $value = $this->getValue(); $value = Mage::helper('cataloginventory/minsaleqty')->makeArrayFieldValue($value); $this->setValue($value); + return $this; } /** * Prepare data before save + * @return $this */ protected function _beforeSave() { diff --git a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php index 565d965683e..25b2a888287 100644 --- a/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php +++ b/app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php @@ -7,20 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Backend for qty increments * + * @category Mage + * @package Mage_CatalogInventory + * @author Magento Core Team */ class Mage_CatalogInventory_Model_System_Config_Backend_Qtyincrements extends Mage_Core_Model_Config_Data { diff --git a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml index 62fb14beeef..a00d092aa8e 100644 --- a/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogInventory/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 fa27fdaca4f..46b0d69d0db 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api.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. (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/CatalogInventory/etc/api2.xml b/app/code/core/Mage/CatalogInventory/etc/api2.xml index 998e88c7193..c4bf7ffb724 100644 --- a/app/code/core/Mage/CatalogInventory/etc/api2.xml +++ b/app/code/core/Mage/CatalogInventory/etc/api2.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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 7cb0db8e7fa..771582bc337 100644 --- a/app/code/core/Mage/CatalogInventory/etc/config.xml +++ b/app/code/core/Mage/CatalogInventory/etc/config.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. (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/CatalogInventory/etc/system.xml b/app/code/core/Mage/CatalogInventory/etc/system.xml index 17e27ac84df..f5c706e4ed4 100644 --- a/app/code/core/Mage/CatalogInventory/etc/system.xml +++ b/app/code/core/Mage/CatalogInventory/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php index 3e3a9dfde93..9bff4d83d8e 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php index f08f48a6919..6ae8a191124 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php index 62e6fd6f259..8306518c6d9 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'low_stock_date', 'datetime'); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php index 22ed3d11707..174bdb64fc9 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'manage_stock', 'tinyint(1) unsigned NOT NULL DEFAULT 0'); $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'use_config_manage_stock', 'tinyint(1) unsigned NOT NULL DEFAULT 1'); + $installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php index 989fc4bd3cb..c5fcc07a223 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('cataloginventory_stock_item'), 'stock_status_changed_automatically', 'tinyint(1) unsigned NOT NULL DEFAULT 0'); $installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php index 36edd64f88b..597372d1606 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + foreach ([ 'cataloginventory/options/min_qty' => 'cataloginventory/item_options/min_qty', 'cataloginventory/options/min_sale_qty' => 'cataloginventory/item_options/min_sale_qty', diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php index 39636f74a51..ae568015d6a 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); -$connection = $installer->getConnection(); + /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$connection = $installer->getConnection(); $installer->run(" CREATE TABLE `{$installer->getTable('cataloginventory_stock_status')}` ( diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php index 153d148f4b8..05af7cf8a13 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; -$tableCataloginventoryStockItem = $installer->getTable('cataloginventory_stock_item'); - -$connection = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$connection = $installer->getConnection(); +$tableCataloginventoryStockItem = $installer->getTable('cataloginventory_stock_item'); $connection->addColumn($tableCataloginventoryStockItem, 'use_config_qty_increments', "tinyint(1) unsigned NOT NULL default '1'"); $connection->addColumn($tableCataloginventoryStockItem, 'qty_increments', "decimal(12,4) NOT NULL DEFAULT '0.0000'"); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php index ac0fd4dd072..1912765b221 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS `{$installer->getTable('cataloginventory/stock_status')}_idx`; @@ -46,4 +48,5 @@ KEY `FK_CATALOGINVENTORY_STOCK_STATUS_WEBSITE` (`website_id`) ) ENGINE=MEMORY DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php index 07082011394..b61f1d7a616 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - -$tableCataloginventoryStockItem = $installer->getTable('cataloginventory/stock_item'); +$installer = $this; $connection = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$tableCataloginventoryStockItem = $installer->getTable('cataloginventory/stock_item'); $connection->addColumn($tableCataloginventoryStockItem, 'use_config_enable_qty_increments', "tinyint(1) unsigned NOT NULL default '1'"); $connection->addColumn($tableCataloginventoryStockItem, 'enable_qty_increments', "tinyint(1) unsigned NOT NULL default '0'"); diff --git a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 5c78dcccd46..d82047e3fd1 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php index 82390f5fa6f..51643568886 100644 --- a/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; + /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection = $installer->getConnection(); + $connection->changeTableEngine( $installer->getTable('cataloginventory/stock_status_indexer_tmp'), Varien_Db_Adapter_Pdo_Mysql::ENGINE_MEMORY 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..c9d8cb2c37d 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogInventory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6995fa2b0f8 100644 --- a/app/code/core/Mage/CatalogRule/Helper/Data.php +++ b/app/code/core/Mage/CatalogRule/Helper/Data.php @@ -7,24 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_CatalogRule'; + /** * Algorithm for calculating price rule * diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php index a7df1269ce2..83aaaabc47d 100644 --- a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php +++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog rule indexer * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Action_Index_Refresh { diff --git a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php index 36ce55be46c..575176e9f9b 100644 --- a/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php +++ b/app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog rule indexer for row * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Action_Index_Refresh_Row extends Mage_CatalogRule_Model_Action_Index_Refresh { diff --git a/app/code/core/Mage/CatalogRule/Model/Flag.php b/app/code/core/Mage/CatalogRule/Model/Flag.php index b8325d43cf2..d3b7e54460b 100644 --- a/app/code/core/Mage/CatalogRule/Model/Flag.php +++ b/app/code/core/Mage/CatalogRule/Model/Flag.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php index f1576a5097b..260cf377073 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog rules resource model * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team * @deprecated */ class Mage_CatalogRule_Model_Mysql4_Rule extends Mage_CatalogRule_Model_Resource_Rule diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php index ba530a14695..96371c1d13d 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php index 199535ec156..6f3754ff8c5 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Rule Product Aggregated Price per date Resource Model * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team * @deprecated */ class Mage_CatalogRule_Model_Mysql4_Rule_Product_Price extends Mage_CatalogRule_Model_Resource_Rule_Product_Price diff --git a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php index 0fcbf1158fa..cdfd3cd0c73 100644 --- a/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php index a64de1eddf6..25d37c90a8d 100644 --- a/app/code/core/Mage/CatalogRule/Model/Observer.php +++ b/app/code/core/Mage/CatalogRule/Model/Observer.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Price rules observer model + * + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Observer { @@ -437,7 +442,7 @@ public function prepareCatalogProductCollectionPrices(Varien_Event_Observer $obs ->getRulePrices($date, $websiteId, $groupId, $productIds); foreach ($productIds as $productId) { $key = $this->_getRulePricesKey([$date, $websiteId, $groupId, $productId]); - $this->_rulePrices[$key] = isset($rulePrices[$productId]) ? $rulePrices[$productId] : false; + $this->_rulePrices[$key] = $rulePrices[$productId] ?? false; } } diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php index 8f98bdc4d99..8e21187a69a 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog rules resource model * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abstract { @@ -609,11 +610,7 @@ protected function _calcRuleProductPrice($ruleData, $productData = null) $productPrice = $productData['rule_price']; } else { $websiteId = $ruleData['website_id']; - if (isset($ruleData['website_'.$websiteId.'_price'])) { - $productPrice = $ruleData['website_'.$websiteId.'_price']; - } else { - $productPrice = $ruleData['default_price']; - } + $productPrice = $ruleData['website_' . $websiteId . '_price'] ?? $ruleData['default_price']; } $productPrice = Mage::helper('catalogrule')->calcPriceRule( @@ -674,11 +671,7 @@ protected function _saveRuleProductPrices($arrData) public function getRulePrice($date, $wId, $gId, $pId) { $data = $this->getRulePrices($date, $wId, $gId, [$pId]); - if (isset($data[$pId])) { - return $data[$pId]; - } - - return false; + return $data[$pId] ?? false; } /** diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php index f2785cd5e24..ae6717b0414 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php index 5539618c667..c4b6e88ba0c 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Rule Product Aggregated Price per date Resource Model * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Resource_Rule_Product_Price extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize connection and define main table - * - */ protected function _construct() { $this->_init('catalogrule/rule_product_price', 'rule_product_price_id'); diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php index 585ea9a3842..0b1b150cd3f 100644 --- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php index 86d64e28a8e..7bc34e25f0b 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Rule data model * + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team + * * @method Mage_CatalogRule_Model_Resource_Rule _getResource() * @method Mage_CatalogRule_Model_Resource_Rule getResource() * @method Mage_CatalogRule_Model_Resource_Rule_Collection getCollection() @@ -48,10 +53,6 @@ * @method float getSubDiscountAmount() * @method string getToDate() * @method $this setToDate(string $value) - * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team */ class Mage_CatalogRule_Model_Rule extends Mage_Rule_Model_Abstract { diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php index 0502a01f76d..7aa0d69f24f 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php index 313a961253c..9d44c246ce4 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_CatalogRule_Model_Rule_Action_Product + * + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team + * * @method $this setAttributeOption(array $value) * @method $this setOperatorOption(array $value) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php index 93b3b990369..b338e6768d7 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php index 79852f2d068..add1e673b1f 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Rule Product Condition data model + * + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team */ class Mage_CatalogRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Condition_Product_Abstract { @@ -85,11 +90,9 @@ protected function _getAttributeValue($object) $attrCode = $this->getAttribute(); $storeId = $object->getStoreId(); $defaultStoreId = Mage_Core_Model_App::ADMIN_STORE_ID; - $productValues = isset($this->_entityAttributeValues[$object->getId()]) - ? $this->_entityAttributeValues[$object->getId()] : []; - $defaultValue = isset($productValues[$defaultStoreId]) - ? $productValues[$defaultStoreId] : $object->getData($attrCode); - $value = isset($productValues[$storeId]) ? $productValues[$storeId] : $defaultValue; + $productValues = $this->_entityAttributeValues[$object->getId()] ?? []; + $defaultValue = $productValues[$defaultStoreId] ?? $object->getData($attrCode); + $value = $productValues[$storeId] ?? $defaultValue; $value = $this->_prepareDatetimeValue($value, $object); $value = $this->_prepareMultiselectValue($value, $object); diff --git a/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php b/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php index b92e8a78306..a1c0a99f9ea 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Rule Product Aggregated Price per date Model * + * @category Mage + * @package Mage_CatalogRule + * @author Magento Core Team + * * @method Mage_CatalogRule_Model_Resource_Rule_Product_Price _getResource() * @method Mage_CatalogRule_Model_Resource_Rule_Product_Price getResource() * @method string getRuleDate() @@ -37,17 +42,9 @@ * @method Mage_CatalogRule_Model_Rule_Product_Price setLatestStartDate(string $value) * @method string getEarliestEndDate() * @method Mage_CatalogRule_Model_Rule_Product_Price setEarliestEndDate(string $value) - * - * @category Mage - * @package Mage_CatalogRule - * @author Magento Core Team */ class Mage_CatalogRule_Model_Rule_Product_Price extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('catalogrule/rule_product_price'); diff --git a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml b/app/code/core/Mage/CatalogRule/etc/adminhtml.xml index 2c8b7ae6dc3..7172d548876 100644 --- a/app/code/core/Mage/CatalogRule/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogRule/etc/adminhtml.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_CatalogRule - * @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_CatalogRule + * @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/CatalogRule/etc/config.xml b/app/code/core/Mage/CatalogRule/etc/config.xml index bdfee0c335e..c2439486b7b 100644 --- a/app/code/core/Mage/CatalogRule/etc/config.xml +++ b/app/code/core/Mage/CatalogRule/etc/config.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_CatalogRule - * @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_CatalogRule + * @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/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php index 33cd7c71644..90a1b32b545 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CatalogRule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php index 113a67d99ca..5c74883c5da 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php index 1beebb50284..25d7a6ff4a1 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('catalogrule'), 'simple_action', 'varchar(32) not null'); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index 0be51c5f65f..a01d130451d 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php index c663a2295df..fccf46228ed 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('catalogrule_product_price'), 'latest_start_date', 'date'); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php index 0490fa5d87d..f44e42d28ac 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index bbca27f9fa8..9db29562fb1 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php index c8f87bbdcbf..f0fd5385487 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - $installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->addKey( $installer->getTable('catalogrule_product'), diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php index fabe9e398eb..5d90ae00b97 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php index 00c2b43829f..59eedba4b7c 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); $ruleGroupWebsiteTable = $installer->getTable('catalogrule/rule_group_website'); diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php index 776e84549e8..1d5cbc8355c 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php index 7b9f00e6a19..cf9dd4343a6 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection() diff --git a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 6870d6416e2..71ee0da5305 100644 --- a/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.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..d9b3c4afd06 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..a11d3bbafcb 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..235b0d2482a 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 @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_CatalogRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php index df1eee82b34..e842802f49c 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -90,11 +91,7 @@ public function getAttributeValue($attribute, $part = null) { $value = $this->getRequest()->getQuery($attribute->getAttributeCode()); if ($part && $value) { - if (isset($value[$part])) { - $value = $value[$part]; - } else { - $value = ''; - } + $value = $value[$part] ?? ''; } return $value; diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php index 8054a1f27c5..6183863e182 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_CatalogSearch - * @author Magento Core Team + * @author Magento Core Team * * @method setResultCount(int $value) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php index f3904529a50..c83e82857a0 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php +++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer.php b/app/code/core/Mage/CatalogSearch/Block/Layer.php index b9dd5df9a45..541945bd909 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Block/Layer.php @@ -7,20 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Layered Navigation block for search * + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Block_Layer extends Mage_Catalog_Block_Layer_View { diff --git a/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php b/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php index c0eba4c1624..a74b753f5d2 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Block/Result.php b/app/code/core/Mage/CatalogSearch/Block/Result.php index 40787a4bb7e..6f447cd2cab 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Result.php +++ b/app/code/core/Mage/CatalogSearch/Block/Result.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/CatalogSearch/Block/Term.php b/app/code/core/Mage/CatalogSearch/Block/Term.php index ad24531c494..9495ecd1282 100644 --- a/app/code/core/Mage/CatalogSearch/Block/Term.php +++ b/app/code/core/Mage/CatalogSearch/Block/Term.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..0808ffa0837 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -35,6 +36,8 @@ class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract */ const MAX_QUERY_LEN = 200; + protected $_moduleName = 'Mage_CatalogSearch'; + /** * Query object * diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php index 60a6cca916c..1969757f417 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,10 +69,6 @@ class Mage_CatalogSearch_Model_Advanced extends Mage_Core_Model_Abstract */ protected $_productCollection; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_getEngine(); @@ -107,7 +104,7 @@ protected function _getResource() /** * Retrieve array of attributes used in advanced search * - * @return array + * @return Mage_Catalog_Model_Resource_Product_Attribute_Collection */ public function getAttributes() { @@ -331,10 +328,12 @@ public function prepareProductCollection($collection) ->setStore(Mage::app()->getStore()) ->addMinimalPrice() ->addTaxPercents() - ->addStoreFilter(); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + ->addStoreFilter() + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getVisibleStatusIds() + ]); Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($collection); + return $this; } } diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php index 053499721c5..a0a1a3827b4 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php index 9b3e8686ae4..81519c96cb3 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch Fulltext Observer * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Fulltext_Observer { diff --git a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php index b5ded7dd655..6ac0e433828 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer.php b/app/code/core/Mage/CatalogSearch/Model/Layer.php index 270e61615e9..fef37c96505 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Layer extends Mage_Catalog_Model_Layer { const XML_PATH_DISPLAY_LAYER_COUNT = 'catalog/search/use_layered_navigation_count'; @@ -32,7 +38,7 @@ public function getProductCollection() if (isset($this->_productCollections[$this->getCurrentCategory()->getId()])) { $collection = $this->_productCollections[$this->getCurrentCategory()->getId()]; } else { - $collection = Mage::getResourceModel('catalogsearch/fulltext_collection'); + $collection = Mage::helper('catalogsearch')->getEngine()->getResultCollection(); $this->prepareProductCollection($collection); $this->_productCollections[$this->getCurrentCategory()->getId()] = $collection; } @@ -54,9 +60,10 @@ public function prepareProductCollection($collection) ->addPriceData() ->addTaxPercents() ->addStoreFilter() - ->addUrlRewrite(); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + ->addUrlRewrite() + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getVisibleStatusIds() + ]); Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($collection); return $this; diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php index 83ed313cfda..31c489f3ef0 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php index 3ee13969bd4..4282854e727 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php index 9be9f21e530..b2c862836d1 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php index 310859e68d2..1515c01aa55 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php index cbf6591f5c2..a732f9c9fd5 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php index c63c5cd67a7..9669af04182 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php index a063ece551f..ddd87dd23ea 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php index fcd9dde6e06..519446ce5fc 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog search query resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team * @deprecated */ class Mage_CatalogSearch_Model_Mysql4_Query extends Mage_CatalogSearch_Model_Resource_Query diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php index 1cdbc19d68e..9e828cdfcf2 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php index 242d06c0084..7e628fce33c 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Query.php b/app/code/core/Mage/CatalogSearch/Model/Query.php index 8e4d1f94ee0..451621a465b 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Query.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog search query model * + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team + * * @method Mage_CatalogSearch_Model_Resource_Query _getResource() * @method Mage_CatalogSearch_Model_Resource_Query getResource() * @method Mage_CatalogSearch_Model_Resource_Query_Collection getCollection() @@ -46,23 +51,12 @@ * @method $this setSynonymFor(string $value) * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team */ 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..8e04612c35d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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'); @@ -68,7 +65,7 @@ protected function _dispatchPreparePriceEvent($select) * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @param string|array $value * @param Mage_CatalogSearch_Model_Resource_Advanced_Collection $collection - * @return mixed + * @return array|false|string|string[] */ public function prepareCondition($attribute, $value, $collection) { diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php index 6a7ac0c9c5e..fc554b2a254 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php index 10140c2cee7..6b27fc44047 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -487,7 +488,7 @@ protected function _getSearchableAttribute($attribute) * * @param string $field * @param string $backendType - * @return Zend_Db_Expr + * @return string */ protected function _unifyField($field, $backendType = 'varchar') { @@ -811,7 +812,7 @@ protected function _saveProductIndexes($storeId, $productIndexes) * * @param int $storeId * @param string $date - * @return string + * @return string|null */ protected function _getStoreDate($storeId, $date = null) { diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php index db0cd5cae2e..f8c7c3481cf 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php index 323dd703c91..1891c01432d 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php index 4e22551485d..a2a8261037b 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * CatalogSearch Mysql resource helper model * - * @category Mage - * @package Mage_Catalog - * @author Magento Core Team + * @category Mage + * @package Mage_Catalog + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Resource_Helper_Mysql4 extends Mage_Eav_Model_Resource_Helper_Mysql4 { @@ -47,7 +48,7 @@ public function chooseFulltext($table, $alias, $select) * * @param string $str The source string * @param int $maxWordLength - * @return array(0=>words, 1=>terms) + * @return array (0=>words, 1=>terms) */ public function prepareTerms($str, $maxWordLength = 0) { 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..7f023d076ea 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Resource/Query.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php index 774a0a09bee..8643d61ecd5 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Query.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog search query resource model * - * @category Mage - * @package Mage_CatalogSearch - * @author Magento Core Team + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_Model_Resource_Query extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php index 6a61c660310..d3e1b50fdd1 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php index 5222ffc77d5..8896b16d069 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php +++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,7 +77,7 @@ protected function _getAttributesCollection() * Check attribute is Text and is Searchable * * @param Mage_Catalog_Model_Entity_Attribute $attribute - * @return boolean + * @return bool */ protected function _isAttributeTextAndSearchable($attribute) { @@ -93,7 +94,7 @@ protected function _isAttributeTextAndSearchable($attribute) * Check attributes has options and searchable * * @param Mage_Catalog_Model_Entity_Attribute $attribute - * @return boolean + * @return bool */ protected function _hasAttributeOptionsAndSearchable($attribute) { @@ -150,7 +151,8 @@ protected function _getSearchEntityIdsSql($query) ['t2' => $table], $this->getConnection()->quoteInto( 't1.entity_id = t2.entity_id AND t1.attribute_id = t2.attribute_id AND t2.store_id = ?', - $this->getStoreId()), + $this->getStoreId() + ), [] ) ->where('t1.attribute_id IN (?)', $attributeIds) @@ -171,7 +173,7 @@ protected function _getSearchEntityIdsSql($query) * Retrieve SQL for search entities by option * * @param string $query - * @return string + * @return false|string */ protected function _getSearchInOptionSql($query) { @@ -204,17 +206,23 @@ protected function _getSearchInOptionSql($query) $ifStoreId = $this->getConnection()->getIfNullSql('s.store_id', 'd.store_id'); $ifValue = $this->getConnection()->getCheckSql('s.value_id > 0', 's.value', 'd.value'); $select = $this->getConnection()->select() - ->from(['d'=>$optionValueTable], - ['option_id', - 'o.attribute_id', - 'store_id' => $ifStoreId, - 'a.frontend_input']) - ->joinLeft(['s'=>$optionValueTable], + ->from( + ['d'=>$optionValueTable], + ['option_id', + 'o.attribute_id', + 'store_id' => $ifStoreId, + 'a.frontend_input'] + ) + ->joinLeft( + ['s'=>$optionValueTable], $this->getConnection()->quoteInto('s.option_id = d.option_id AND s.store_id=?', $storeId), - []) - ->join(['o'=>$optionTable], + [] + ) + ->join( + ['o'=>$optionTable], 'o.option_id=d.option_id', - []) + [] + ) ->join(['a' => $attributesTable], 'o.attribute_id=a.attribute_id', []) ->where('d.store_id=0') ->where('o.attribute_id IN (?)', $attributeIds) diff --git a/app/code/core/Mage/CatalogSearch/Model/Session.php b/app/code/core/Mage/CatalogSearch/Model/Session.php index 508b74b49fb..dd407fabb1a 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Session.php +++ b/app/code/core/Mage/CatalogSearch/Model/Session.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..c66d503570d 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 @@ -7,20 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/AdvancedController.php b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php index a1a992c7b28..ba84c6061eb 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php index 222a39c7696..25464db9fd2 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/AjaxController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php index 800a46e13ca..2760a6bf7ed 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/ResultController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/ResultController.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Catalog Search Controller + * + * @category Mage + * @package Mage_CatalogSearch + * @author Magento Core Team */ class Mage_CatalogSearch_ResultController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/CatalogSearch/controllers/TermController.php b/app/code/core/Mage/CatalogSearch/controllers/TermController.php index 7a1e174e155..07f1182f8fd 100644 --- a/app/code/core/Mage/CatalogSearch/controllers/TermController.php +++ b/app/code/core/Mage/CatalogSearch/controllers/TermController.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 13edcefc99b..8485e1e0855 100644 --- a/app/code/core/Mage/CatalogSearch/etc/adminhtml.xml +++ b/app/code/core/Mage/CatalogSearch/etc/adminhtml.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. (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/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml index 709882e3559..f171756b944 100644 --- a/app/code/core/Mage/CatalogSearch/etc/config.xml +++ b/app/code/core/Mage/CatalogSearch/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5f790fcfa91 100644 --- a/app/code/core/Mage/CatalogSearch/etc/system.xml +++ b/app/code/core/Mage/CatalogSearch/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php index 7313a763ea6..97144668400 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php index 01777d48768..f04b0e7d753 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php index 5a5e045a6dc..64a97a90590 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE {$this->getTable('catalogsearch_query')} ADD `display_in_terms` TINYINT( 1 ) NOT NULL DEFAULT '0'; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php index 483b3bcc842..3ac43a01bf9 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php index 1653f8a6a03..859b9aa634b 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE {$this->getTable('catalogsearch_query')} ADD `updated_at` DATETIME NOT NULL; diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php index fffb7cae465..29e0b9787ef 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,19 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ - -$installer->startSetup(); -$installer->endSetup(); + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ \ No newline at end of file diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php index 9510aa6b69a..8bbb6c974ec 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -$connection = $installer->getConnection(); /** @var Mage_Core_Model_Resource_Setup $this */ -/** @var Varien_Db_Adapter_Pdo_Mysql $connection */ - +$installer = $this; $installer->startSetup(); +/** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$connection = $installer->getConnection(); + $installer->run(" DROP TABLE IF EXISTS `{$installer->getTable('catalogsearch_fulltext')}`; CREATE TABLE `{$installer->getTable('catalogsearch_fulltext')}` ( diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php index 41b92bc6dbd..b1cf994ca73 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $table = $installer->getTable('catalogsearch_query'); diff --git a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 01cce968f7f..9f0837a5145 100644 --- a/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/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..647587f6648 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CatalogSearch + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..79330fd765c 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation.php @@ -7,25 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Adminhtml/Validation/Form.php b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php index e4e13a17d6c..9d9df3db6ef 100644 --- a/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php +++ b/app/code/core/Mage/Centinel/Block/Adminhtml/Validation/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Authentication.php b/app/code/core/Mage/Centinel/Block/Authentication.php index 20d6dfe647d..6858a92e119 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication.php +++ b/app/code/core/Mage/Centinel/Block/Authentication.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Authentication/Complete.php b/app/code/core/Mage/Centinel/Block/Authentication/Complete.php index d9efdcd17f8..14cd5acf801 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication/Complete.php +++ b/app/code/core/Mage/Centinel/Block/Authentication/Complete.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Block/Authentication/Start.php b/app/code/core/Mage/Centinel/Block/Authentication/Start.php index 4d9172beb6a..3e135b838d3 100644 --- a/app/code/core/Mage/Centinel/Block/Authentication/Start.php +++ b/app/code/core/Mage/Centinel/Block/Authentication/Start.php @@ -7,25 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Authentication start/redirect form + * + * @category Mage + * @package Mage_Centinel + * @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/Block/Logo.php b/app/code/core/Mage/Centinel/Block/Logo.php index d4ada6ee2a8..f17b63bb42e 100644 --- a/app/code/core/Mage/Centinel/Block/Logo.php +++ b/app/code/core/Mage/Centinel/Block/Logo.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Centinel payment form logo block + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Block_Logo extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Centinel/Helper/Data.php b/app/code/core/Mage/Centinel/Helper/Data.php index ffdf6bb7e6d..98c36d7c496 100644 --- a/app/code/core/Mage/Centinel/Helper/Data.php +++ b/app/code/core/Mage/Centinel/Helper/Data.php @@ -7,26 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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 { + protected $_moduleName = 'Mage_Centinel'; + /** * Return label for cmpi field * diff --git a/app/code/core/Mage/Centinel/Model/Api.php b/app/code/core/Mage/Centinel/Model/Api.php index 62832b38ff1..7b96e302054 100644 --- a/app/code/core/Mage/Centinel/Model/Api.php +++ b/app/code/core/Mage/Centinel/Model/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -96,7 +97,7 @@ protected function _getVersion() /** * Return transaction type. according centinel documetation it should be "C" * - * @return "C" + * @return string "C" */ protected function _getTransactionType() { @@ -191,7 +192,7 @@ public function callLookup($data) $month = strlen($data->getCardExpMonth()) == 1 ? '0' . $data->getCardExpMonth() : $data->getCardExpMonth(); $currencyCode = $data->getCurrencyCode(); - $currencyNumber = isset(self::$_iso4217Currencies[$currencyCode]) ? self::$_iso4217Currencies[$currencyCode] : ''; + $currencyNumber = self::$_iso4217Currencies[$currencyCode] ?? ''; if (!$currencyNumber) { return $result->setErrorNo(1)->setErrorDesc( Mage::helper('payment')->__('Unsupported currency code: %s.', $currencyCode) @@ -221,7 +222,7 @@ public function callLookup($data) /** * Call centinel api authentication method * - * @return $this + * @return Varien_Object */ public function callAuthentication($data) { diff --git a/app/code/core/Mage/Centinel/Model/Api/Client.php b/app/code/core/Mage/Centinel/Model/Api/Client.php index c7cbbfb1535..8c220ccb4b8 100644 --- a/app/code/core/Mage/Centinel/Model/Api/Client.php +++ b/app/code/core/Mage/Centinel/Model/Api/Client.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Config.php b/app/code/core/Mage/Centinel/Model/Config.php index 820bbcd62fb..e2a22973c6b 100644 --- a/app/code/core/Mage/Centinel/Model/Config.php +++ b/app/code/core/Mage/Centinel/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/Model/Observer.php b/app/code/core/Mage/Centinel/Model/Observer.php index af66023a3cb..86f4daff4e6 100644 --- a/app/code/core/Mage/Centinel/Model/Observer.php +++ b/app/code/core/Mage/Centinel/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Centinel/Model/Service.php b/app/code/core/Mage/Centinel/Model/Service.php index cb8aa785c0d..4303874aca5 100644 --- a/app/code/core/Mage/Centinel/Model/Service.php +++ b/app/code/core/Mage/Centinel/Model/Service.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 3D Secure Validation Model + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_Service extends Varien_Object { @@ -73,7 +78,6 @@ protected function _getSession() /** * Return value from section of centinel config * - * @param string $path * @return string */ protected function _getConfig() diff --git a/app/code/core/Mage/Centinel/Model/Session.php b/app/code/core/Mage/Centinel/Model/Session.php index 51d5861341e..ade7b28ba06 100644 --- a/app/code/core/Mage/Centinel/Model/Session.php +++ b/app/code/core/Mage/Centinel/Model/Session.php @@ -7,28 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Jcb.php b/app/code/core/Mage/Centinel/Model/State/Jcb.php index 17430ecdff8..4673529bcfc 100644 --- a/app/code/core/Mage/Centinel/Model/State/Jcb.php +++ b/app/code/core/Mage/Centinel/Model/State/Jcb.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract Validation State Model for JCB + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_State_Jcb extends Mage_Centinel_Model_StateAbstract { diff --git a/app/code/core/Mage/Centinel/Model/State/Mastercard.php b/app/code/core/Mage/Centinel/Model/State/Mastercard.php index 83f8b450ed8..423fc85e5f7 100644 --- a/app/code/core/Mage/Centinel/Model/State/Mastercard.php +++ b/app/code/core/Mage/Centinel/Model/State/Mastercard.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract Validation State Model for Mastercard + * + * @category Mage + * @package Mage_Centinel + * @author Magento Core Team */ class Mage_Centinel_Model_State_Mastercard extends Mage_Centinel_Model_StateAbstract { diff --git a/app/code/core/Mage/Centinel/Model/State/Visa.php b/app/code/core/Mage/Centinel/Model/State/Visa.php index 71f1a5dfa41..40bbfbd2ed2 100644 --- a/app/code/core/Mage/Centinel/Model/State/Visa.php +++ b/app/code/core/Mage/Centinel/Model/State/Visa.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..ea16b32b179 100644 --- a/app/code/core/Mage/Centinel/Model/StateAbstract.php +++ b/app/code/core/Mage/Centinel/Model/StateAbstract.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Centinel + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/controllers/Adminhtml/Centinel/IndexController.php b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php index 42c5cb5a3f4..f442d47b116 100644 --- a/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/Adminhtml/Centinel/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/controllers/IndexController.php b/app/code/core/Mage/Centinel/controllers/IndexController.php index f565125ca12..0cd4f535594 100644 --- a/app/code/core/Mage/Centinel/controllers/IndexController.php +++ b/app/code/core/Mage/Centinel/controllers/IndexController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Centinel/etc/config.xml b/app/code/core/Mage/Centinel/etc/config.xml index 08ab96cce0a..418135490b4 100644 --- a/app/code/core/Mage/Centinel/etc/config.xml +++ b/app/code/core/Mage/Centinel/etc/config.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. (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/Centinel/etc/system.xml b/app/code/core/Mage/Centinel/etc/system.xml index ed6d38cc9b7..70875873eb4 100644 --- a/app/code/core/Mage/Centinel/etc/system.xml +++ b/app/code/core/Mage/Centinel/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Agreements.php b/app/code/core/Mage/Checkout/Block/Agreements.php index 68f6aebe12f..ccd84f6daec 100644 --- a/app/code/core/Mage/Checkout/Block/Agreements.php +++ b/app/code/core/Mage/Checkout/Block/Agreements.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php index c3ae9f09981..e0d35774903 100644 --- a/app/code/core/Mage/Checkout/Block/Cart.php +++ b/app/code/core/Mage/Checkout/Block/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php index 1120fd62668..3680f68ad36 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -79,10 +80,7 @@ public function getItemRender($type) */ public function getItemRendererInfo($type) { - if (isset($this->_itemRenders[$type])) { - return $this->_itemRenders[$type]; - } - return $this->_itemRenders['default']; + return $this->_itemRenders[$type] ?? $this->_itemRenders['default']; } /** diff --git a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php index 36d5ab0123a..1cbfd12a78a 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Coupon.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Coupon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php index e77fae9d7ab..4daea3cc379 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Crosssell.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,10 +166,12 @@ protected function _getCollection() ->getProductCollection() ->setStoreId(Mage::app()->getStore()->getId()) ->addStoreFilter() + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds() + ]) ->setPageSize($this->_maxItemCount); $this->_addProductAttributesAndPrices($collection); - Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($collection); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection); Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($collection); diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php index 0d14afb3201..b00312a5212 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php index 2fb03721698..27712902ec4 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart item render block * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method bool hasProductName() * @method $this setProductName(string $value) diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php index 4ddde64dda2..8388fa5466a 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -92,8 +93,9 @@ public function getProductName() */ public function getProductAttributes() { - return $this->getProduct()->getTypeInstance(true) - ->getSelectedAttributesInfo($this->getProduct()); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->getSelectedAttributesInfo($this->getProduct()); } /** diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php index 150bc3a046c..5bef810831d 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Cart/Minicart.php b/app/code/core/Mage/Checkout/Block/Cart/Minicart.php index 9412ed3dba0..cdaaf6c7d33 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Minicart.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Minicart.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Minicart block * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Cart_Minicart extends Mage_Checkout_Block_Cart_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php index e68dd31ff2b..8d0edbee969 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Shipping.php @@ -7,19 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..57b167cf2cb 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -175,7 +176,7 @@ public function isPossibleOnepageCheckout() /** * Get one page checkout page url * - * @return bool + * @return string */ public function getCheckoutUrl() { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Totals.php b/app/code/core/Mage/Checkout/Block/Cart/Totals.php index 280c36c0548..727f1785796 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Totals.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Totals.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; @@ -122,7 +128,7 @@ public function needDisplayBaseGrandtotal() } /** - * Get formated in base currency base grand total value + * Get formatted in base currency base grand total value * * @return string */ diff --git a/app/code/core/Mage/Checkout/Block/Links.php b/app/code/core/Mage/Checkout/Block/Links.php index 3ebf420d6a2..edfb7b30005 100644 --- a/app/code/core/Mage/Checkout/Block/Links.php +++ b/app/code/core/Mage/Checkout/Block/Links.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Links block * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method int getSummaryQty() * @method Mage_Page_Block_Template_Links getParentBlock() diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php index 5420eee3e28..a8e4f8b6c69 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Address/Select.php b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php index e491cfecc34..c1e57ef835a 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Multishipping_Address_Select extends Mage_Checkout_Block_Multishipping_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php index 177339e7c8e..7697f97523a 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Billing.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php index 10f09a2ee76..3d8bb08bb9f 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -55,7 +55,7 @@ protected function _canUseMethod($method) /** * Retrieve code of current payment method * - * @return mixed + * @return false|string */ public function getSelectedMethodCode() { diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php index 44f46420214..5c674d6273f 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Link.php b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php index 43de66b05d0..4b426b1ee2e 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Link.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Multishipping_Link extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php index d098589aea4..f03a2eee3c1 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Multishipping_Overview extends Mage_Sales_Block_Items_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php index 890927fab51..1d396c5b34b 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php index f24dd0b83c3..3a2175884f9 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..451d908ce62 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/State.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..812ef9f186e 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Success.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Success.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,19 +24,18 @@ * * @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 { /** - * @return bool|string + * @return array|false */ public function getOrderIds() { $ids = Mage::getSingleton('core/session')->getOrderIds(true); if ($ids && is_array($ids)) { return $ids; - return implode(', ', $ids); } return false; } diff --git a/app/code/core/Mage/Checkout/Block/Onepage.php b/app/code/core/Mage/Checkout/Block/Onepage.php index 2fc13d35ae2..65c20b0dab7 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage.php +++ b/app/code/core/Mage/Checkout/Block/Onepage.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php index dc5882d8c62..52e049b2878 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php index e3dfebcf7cc..a829fdb4d9f 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -165,7 +166,7 @@ public function getMiddlename() /** * Check is Quote items can ship to * - * @return boolean + * @return bool */ public function canShip() { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php index ef84b82626a..6846ced3eae 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Failure.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Failure.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Link.php b/app/code/core/Mage/Checkout/Block/Onepage/Link.php index e556b9cfcd8..3049cf73168 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Link.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Link extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Login.php b/app/code/core/Mage/Checkout/Block/Onepage/Login.php index 70a59fa54c3..f2e01a0aff4 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Login.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Login.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout status * * @category Mage - * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Login extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php index 8783a3ff3a5..6a14f0e5a13 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout status * * @category Mage - * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Payment extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php index 52a2d523c65..5d37dbdd92c 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php index 9aff4875bd6..29142271a14 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout status * * @category Mage - * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Payment_Methods extends Mage_Payment_Block_Form_Container { @@ -50,7 +50,7 @@ protected function _canUseMethod($method) /** * Retrieve code of current payment method * - * @return mixed + * @return false|string */ public function getSelectedMethodCode() { @@ -95,5 +95,6 @@ public function getMethodLabelAfterHtml(Mage_Payment_Model_Method_Abstract $meth if ($form = $this->getChild('payment.method.' . $method->getCode())) { return $form->getMethodLabelAfterHtml(); } + return ''; } } diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php index ea44325b38e..b8694ff42cc 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Progress.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Progress.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Progress extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review.php b/app/code/core/Mage/Checkout/Block/Onepage/Review.php index 77d16b08eb3..ea9d735fcc6 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout status * * @category Mage - * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Review extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php index c2af3dc3820..9645ec3cd18 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php index 9414566e9c2..8169a132885 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Shipping/Method.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php index 2b7d81520bc..5500a1c5c7e 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout status * * @category Mage - * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Block_Onepage_Shipping_Method extends Mage_Checkout_Block_Onepage_Abstract { diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php index 4a24ab2978f..bc7ef3dcb33 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php index 4a18e0aa557..28d9fcf0053 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Success.php b/app/code/core/Mage/Checkout/Block/Onepage/Success.php index b38aca6b78e..d2b45e1ec77 100644 --- a/app/code/core/Mage/Checkout/Block/Onepage/Success.php +++ b/app/code/core/Mage/Checkout/Block/Onepage/Success.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..875df30aeee 100644 --- a/app/code/core/Mage/Checkout/Block/Success.php +++ b/app/code/core/Mage/Checkout/Block/Success.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Default.php b/app/code/core/Mage/Checkout/Block/Total/Default.php index 2fd4aebd536..55d0b772038 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Default.php +++ b/app/code/core/Mage/Checkout/Block/Total/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Block/Total/Nominal.php b/app/code/core/Mage/Checkout/Block/Total/Nominal.php index ce6c3836b54..5189a85c283 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Nominal.php +++ b/app/code/core/Mage/Checkout/Block/Total/Nominal.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Nominal total rendered - * * Each item is rendered as separate total with its details + * + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Block_Total_Nominal extends Mage_Checkout_Block_Total_Default { diff --git a/app/code/core/Mage/Checkout/Block/Total/Tax.php b/app/code/core/Mage/Checkout/Block/Total/Tax.php index 18874c00298..6cb1f9d5c90 100644 --- a/app/code/core/Mage/Checkout/Block/Total/Tax.php +++ b/app/code/core/Mage/Checkout/Block/Total/Tax.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Controller/Action.php b/app/code/core/Mage/Checkout/Controller/Action.php index 818d6f61293..5f65ad6d673 100644 --- a/app/code/core/Mage/Checkout/Controller/Action.php +++ b/app/code/core/Mage/Checkout/Controller/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Exception.php b/app/code/core/Mage/Checkout/Exception.php index b8a90c5767f..4f06b83de80 100644 --- a/app/code/core/Mage/Checkout/Exception.php +++ b/app/code/core/Mage/Checkout/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Helper/Cart.php b/app/code/core/Mage/Checkout/Helper/Cart.php index b30e3e44370..bc83915b033 100644 --- a/app/code/core/Mage/Checkout/Helper/Cart.php +++ b/app/code/core/Mage/Checkout/Helper/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,6 +38,8 @@ class Mage_Checkout_Helper_Cart extends Mage_Core_Helper_Url */ const COUPON_CODE_MAX_LENGTH = 255; + protected $_moduleName = 'Mage_Checkout'; + /** * Retrieve cart instance * diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php index b5bbf4aad1a..6185575c21f 100644 --- a/app/code/core/Mage/Checkout/Helper/Data.php +++ b/app/code/core/Mage/Checkout/Helper/Data.php @@ -7,29 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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 { const XML_PATH_GUEST_CHECKOUT = 'checkout/options/guest_checkout'; const XML_PATH_CUSTOMER_MUST_BE_LOGGED = 'checkout/options/customer_must_be_logged'; + protected $_moduleName = 'Mage_Checkout'; + protected $_agreements = null; /** @@ -341,7 +344,7 @@ public function isContextCheckout() /** * Check if user must be logged during checkout process * - * @return boolean + * @return bool */ public function isCustomerMustBeLogged() { diff --git a/app/code/core/Mage/Checkout/Helper/Url.php b/app/code/core/Mage/Checkout/Helper/Url.php index 24edc01e3bc..e5613d57805 100644 --- a/app/code/core/Mage/Checkout/Helper/Url.php +++ b/app/code/core/Mage/Checkout/Helper/Url.php @@ -7,24 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { + protected $_moduleName = 'Mage_Checkout'; + /** * Retrieve shopping cart url * diff --git a/app/code/core/Mage/Checkout/Model/Agreement.php b/app/code/core/Mage/Checkout/Model/Agreement.php index 40b5f40f887..57ee0e32c45 100644 --- a/app/code/core/Mage/Checkout/Model/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource.php b/app/code/core/Mage/Checkout/Model/Api/Resource.php index 582da05d9e0..9eab710d6b7 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -166,7 +167,7 @@ protected function _updateAttributes($data, $object, $type, array $attributes = * * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array $attributes + * @param array|null $attributes * @return array */ protected function _getAttributes($object, $type, array $attributes = null) @@ -205,7 +206,7 @@ protected function _getAttributes($object, $type, array $attributes = null) * * @param string $attributeCode * @param string $type - * @param array $attributes + * @param array|null $attributes * @return bool */ protected function _isAllowedAttribute($attributeCode, $type, array $attributes = null) diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php index 414fe1b4097..e4a4b890bcf 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php index e4d9ae0ce28..b467ed3148a 100644 --- a/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php +++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Product.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * API Resource class for product + * + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Api_Resource_Product extends Mage_Checkout_Model_Api_Resource { diff --git a/app/code/core/Mage/Checkout/Model/Cart.php b/app/code/core/Mage/Checkout/Model/Cart.php index 79c38d7a7f6..6ed9d18cc02 100644 --- a/app/code/core/Mage/Checkout/Model/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Api.php index 450a00ce754..cb06812276f 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..cdf82697f81 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Api/V2.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php index 1ecf6611971..0e7466da75e 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..eea2cab2a70 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 @@ -7,25 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php index 0c2c8f042da..080813ae4e3 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -198,7 +199,7 @@ protected function _prepareCustomerData($data) * Prepare customer entered data for implementing * * @param array $data - * @return array + * @return array|null */ protected function _prepareCustomerAddressData($data) { 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..95746d8ccf0 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -45,7 +46,7 @@ protected function _prepareCustomerData($data) * Prepare customer entered data for implementing * * @param object $data - * @return array + * @return array|null */ protected function _prepareCustomerAddressData($data) { diff --git a/app/code/core/Mage/Checkout/Model/Cart/Interface.php b/app/code/core/Mage/Checkout/Model/Cart/Interface.php index 16820535c58..597b9c8b1f5 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Interface.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart interface * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ interface Mage_Checkout_Model_Cart_Interface diff --git a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php index 866e60fc8ad..fc1534947d7 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -151,7 +152,7 @@ public function setPaymentMethod($quoteId, $paymentData, $store = null) $this->_fault('billing_address_is_not_set'); } $quote->getBillingAddress()->setPaymentMethod( - isset($paymentData['method']) ? $paymentData['method'] : null + $paymentData['method'] ?? null ); } else { // check if shipping address is set @@ -159,7 +160,7 @@ public function setPaymentMethod($quoteId, $paymentData, $store = null) $this->_fault('shipping_address_is_not_set'); } $quote->getShippingAddress()->setPaymentMethod( - isset($paymentData['method']) ? $paymentData['method'] : null + $paymentData['method'] ?? null ); } 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..9a93760e572 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 @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php index 67a5204ec36..0940ef46adb 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..e03ce542b97 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 @@ -7,32 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** * Return an Array of Object attributes. * - * @param Mixed $data + * @param mixed $data * @return array */ protected function _prepareProductsData($data) diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php index 98e9d5d15f7..72d47949873 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..d9e167f783f 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 @@ -7,25 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..e53344db9eb 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 @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Agreement.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php index a38613cd848..6272516a504 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php index 0b57dffb454..2068b9621fc 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php index 172dbdc6a53..bd4da70faee 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php index a01cc924d07..f8e51fd9bdc 100644 --- a/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Checkout/Model/Observer.php index 4154217a71c..d2c082f8221 100644 --- a/app/code/core/Mage/Checkout/Model/Observer.php +++ b/app/code/core/Mage/Checkout/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Checkout - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Checkout_Model_Observer { diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php index f3be77c43ac..d7c16871866 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php index 6b4d922746a..2505edd41ed 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Resource/Cart.php b/app/code/core/Mage/Checkout/Model/Resource/Cart.php index 948091e0cb8..1e037ea93a1 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Cart.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..0ea7b39fdae 100644 --- a/app/code/core/Mage/Checkout/Model/Resource/Setup.php +++ b/app/code/core/Mage/Checkout/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..1ce32be6239 100644 --- a/app/code/core/Mage/Checkout/Model/Session.php +++ b/app/code/core/Mage/Checkout/Model/Session.php @@ -7,19 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Checkout/Model/Type/Abstract.php index d520edfed89..82afb0a3108 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Abstract.php +++ b/app/code/core/Mage/Checkout/Model/Type/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php index eb92936ce91..3cfc2e37a29 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Multishipping checkout model * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team * * @method bool getCollectRatesFlag() * @method $this setCollectRatesFlag(bool $value) @@ -39,9 +40,6 @@ class Mage_Checkout_Model_Type_Multishipping extends Mage_Checkout_Model_Type_Ab */ protected $_quoteShippingAddressesItems; - /** - * Constructor - */ public function __construct() { parent::__construct(); @@ -173,7 +171,7 @@ public function removeAddressItem($addressId, $itemId) /** * Require shiping rate recollect */ - $address->setCollectShippingRates((boolean) $this->getCollectRatesFlag()); + $address->setCollectShippingRates((bool) $this->getCollectRatesFlag()); if (count($address->getAllItems()) == 0) { $address->isDeleted(true); @@ -289,7 +287,7 @@ protected function _addShippingItem($quoteItemId, $data) { $qty = isset($data['qty']) ? (int) $data['qty'] : 1; //$qty = $qty > 0 ? $qty : 1; - $addressId = isset($data['address']) ? $data['address'] : false; + $addressId = $data['address'] ?? false; $quoteItem = $this->getQuote()->getItemById($quoteItemId); if ($addressId && $quoteItem) { @@ -320,7 +318,7 @@ protected function _addShippingItem($quoteItemId, $data) /** * Require shiping rate recollect */ - $quoteAddress->setCollectShippingRates((boolean) $this->getCollectRatesFlag()); + $quoteAddress->setCollectShippingRates((bool) $this->getCollectRatesFlag()); } } return $this; 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..d07395ee64d 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php index 17f8be43769..3b23e0954e2 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php +++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * One page checkout processing model + * + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_Model_Type_Onepage { @@ -86,10 +91,7 @@ public function getCheckout() */ public function getQuote() { - if ($this->_quote === null) { - return $this->_checkoutSession->getQuote(); - } - return $this->_quote; + return $this->_quote ?? $this->_checkoutSession->getQuote(); } /** @@ -637,9 +639,9 @@ public function savePayment($data) } $quote = $this->getQuote(); if ($quote->isVirtual()) { - $quote->getBillingAddress()->setPaymentMethod(isset($data['method']) ? $data['method'] : null); + $quote->getBillingAddress()->setPaymentMethod($data['method'] ?? null); } else { - $quote->getShippingAddress()->setPaymentMethod(isset($data['method']) ? $data['method'] : null); + $quote->getShippingAddress()->setPaymentMethod($data['method'] ?? null); } // shipping totals may be affected by payment method diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php index 605f1f64c80..fb58951f216 100644 --- a/app/code/core/Mage/Checkout/controllers/CartController.php +++ b/app/code/core/Mage/Checkout/controllers/CartController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/IndexController.php b/app/code/core/Mage/Checkout/controllers/IndexController.php index d6a4ad064a7..9071ae4c07a 100644 --- a/app/code/core/Mage/Checkout/controllers/IndexController.php +++ b/app/code/core/Mage/Checkout/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php index b2a424196cc..2e11f595ec8 100644 --- a/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php +++ b/app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/controllers/MultishippingController.php b/app/code/core/Mage/Checkout/controllers/MultishippingController.php index 822dbb98fae..d3ce45642e9 100644 --- a/app/code/core/Mage/Checkout/controllers/MultishippingController.php +++ b/app/code/core/Mage/Checkout/controllers/MultishippingController.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Multishipping checkout controller * - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_MultishippingController extends Mage_Checkout_Controller_Action { @@ -431,7 +434,7 @@ public function billingAction() /** * Validation of selecting of billing address * - * @return boolean + * @return bool */ protected function _validateBilling() { diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php index 18ae29ccbf7..242cb02082b 100644 --- a/app/code/core/Mage/Checkout/controllers/OnepageController.php +++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Onepage controller for checkout * - * @category Mage - * @package Mage_Checkout - * @author Magento Core Team + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Checkout_OnepageController extends Mage_Checkout_Controller_Action { @@ -665,7 +666,7 @@ protected function _filterPostData($data) /** * Check can page show for unregistered users * - * @return boolean + * @return bool */ protected function _canShowForUnregisteredUsers() { diff --git a/app/code/core/Mage/Checkout/etc/adminhtml.xml b/app/code/core/Mage/Checkout/etc/adminhtml.xml index b6aba2126a8..de7951eb031 100644 --- a/app/code/core/Mage/Checkout/etc/adminhtml.xml +++ b/app/code/core/Mage/Checkout/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 1f2667bfb4f..3277d3388d7 100644 --- a/app/code/core/Mage/Checkout/etc/api.xml +++ b/app/code/core/Mage/Checkout/etc/api.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 c78207df7c5..388088225af 100644 --- a/app/code/core/Mage/Checkout/etc/config.xml +++ b/app/code/core/Mage/Checkout/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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 aade263fbd8..1154f13529f 100644 --- a/app/code/core/Mage/Checkout/etc/jstranslator.xml +++ b/app/code/core/Mage/Checkout/etc/jstranslator.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. (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/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml index 2adaa43333e..eb8ddcef8f3 100644 --- a/app/code/core/Mage/Checkout/etc/system.xml +++ b/app/code/core/Mage/Checkout/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php index 2aede21c0c4..4bfe0505adb 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php index 86549ff0849..5cd2e39a24f 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php index f989c102a0a..b3c41e2c52a 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php index 26fd8dfbd6f..72afad52798 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn( diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php index 8d413b55b45..e7337f0a33d 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn( diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php index efd46acce22..098f59a3231 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Checkout_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $setup = $installer->getConnection(); $select = $setup->select() diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php index be7d591c5c7..b552989c583 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Checkout_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $connection = $installer->getConnection(); $table = $installer->getTable('core/config_data'); diff --git a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 357aa1b7e0b..56aa269cdec 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Checkout/sql/checkout_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php index 8561f3d4f68..45387aabe60 100644 --- a/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Checkout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php index 3499ae4fc1d..f1ac06e43f9 100644 --- a/app/code/core/Mage/Cms/Block/Block.php +++ b/app/code/core/Mage/Cms/Block/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php index e974466cd21..d2adaed5150 100644 --- a/app/code/core/Mage/Cms/Block/Page.php +++ b/app/code/core/Mage/Cms/Block/Page.php @@ -7,25 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms page content block * - * @method int getPageId() - * * @category Mage * @package Mage_Cms * @author Magento Core Team + * + * @method int getPageId() */ class Mage_Cms_Block_Page extends Mage_Core_Block_Abstract { diff --git a/app/code/core/Mage/Cms/Block/Widget/Block.php b/app/code/core/Mage/Cms/Block/Widget/Block.php index 36974b5c5c7..51164a52a8e 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Block.php +++ b/app/code/core/Mage/Cms/Block/Widget/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php index 557274172ff..6f740b2342e 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php +++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Cms * @author Magento Core Team */ - class Mage_Cms_Block_Widget_Page_Link extends Mage_Core_Block_Html_Link implements Mage_Widget_Block_Interface { /** diff --git a/app/code/core/Mage/Cms/Controller/Router.php b/app/code/core/Mage/Cms/Controller/Router.php index afedeb37350..7e5dc5e9c92 100644 --- a/app/code/core/Mage/Cms/Controller/Router.php +++ b/app/code/core/Mage/Cms/Controller/Router.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms Controller Router * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Controller_Router extends Mage_Core_Controller_Varien_Router_Abstract { diff --git a/app/code/core/Mage/Cms/Helper/Data.php b/app/code/core/Mage/Cms/Helper/Data.php index a9c17ba9b07..918ba93b6c9 100644 --- a/app/code/core/Mage/Cms/Helper/Data.php +++ b/app/code/core/Mage/Cms/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,6 +33,8 @@ class Mage_Cms_Helper_Data extends Mage_Core_Helper_Abstract const XML_NODE_ALLOWED_STREAM_WRAPPERS = 'global/cms/allowed_stream_wrappers'; const XML_NODE_ALLOWED_MEDIA_EXT_SWF = 'adminhtml/cms/browser/extensions/media_allowed/swf'; + protected $_moduleName = 'Mage_Cms'; + /** * Retrieve Template processor for Page Content * diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php index 1a55e519c34..deba07d2c38 100644 --- a/app/code/core/Mage/Cms/Helper/Page.php +++ b/app/code/core/Mage/Cms/Helper/Page.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -31,6 +32,8 @@ class Mage_Cms_Helper_Page extends Mage_Core_Helper_Abstract const XML_PATH_NO_COOKIES_PAGE = 'web/default/cms_no_cookies'; const XML_PATH_HOME_PAGE = 'web/default/cms_home_page'; + protected $_moduleName = 'Mage_Cms'; + /** * Renders CMS page on front end * @@ -38,7 +41,7 @@ class Mage_Cms_Helper_Page extends Mage_Core_Helper_Abstract * * @param Mage_Core_Controller_Front_Action $action * @param string $pageId - * @return boolean + * @return bool */ public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId = null) { @@ -51,7 +54,7 @@ public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId = * @param Mage_Core_Controller_Varien_Action $action * @param string $pageId * @param bool $renderLayout - * @return boolean + * @return bool */ protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $pageId = null, $renderLayout = true) { diff --git a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php index 1d4a8f37b12..059f6b88b15 100644 --- a/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php +++ b/app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Cms'; + /** * Current directory path * @var string|false @@ -136,7 +139,7 @@ public function convertIdToPath($id) * File system path correction * * @param string $path Original path - * @param boolean $trim Trim slashes or not + * @param bool $trim Trim slashes or not * @return string */ public function correctPath($path, $trim = true) @@ -162,7 +165,7 @@ public function convertPathToUrl($path) /** * Check whether using static URLs is allowed * - * @return boolean + * @return bool */ public function isUsingStaticUrlsAllowed() { diff --git a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php index 17c80085b55..c16a3c5bbe4 100644 --- a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php +++ b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Block.php b/app/code/core/Mage/Cms/Model/Block.php index 9316b933399..e371fdb60d4 100644 --- a/app/code/core/Mage/Cms/Model/Block.php +++ b/app/code/core/Mage/Cms/Model/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block.php b/app/code/core/Mage/Cms/Model/Mysql4/Block.php index 9b31798177f..af79c1daa2a 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php index 139a6942f68..7c7afe86232 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page.php b/app/code/core/Mage/Cms/Model/Mysql4/Page.php index 5abf8b9c045..56596a5e829 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms page mysql resource * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team * @deprecated */ class Mage_Cms_Model_Mysql4_Page extends Mage_Cms_Model_Resource_Page diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php index f48bd841533..2c2c05a6e41 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php b/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php index b3f386d63ff..3a4ac4a08f7 100644 --- a/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php +++ b/app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php @@ -7,24 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms page service resource model * + * @category Mage + * @package Mage_Cms * @author Magento Core Team * @deprecated */ class Mage_Cms_Model_Mysql4_Page_Service extends Mage_Cms_Model_Resource_Page_Service { - } diff --git a/app/code/core/Mage/Cms/Model/Observer.php b/app/code/core/Mage/Cms/Model/Observer.php index 55c4f8adcac..880e4163642 100644 --- a/app/code/core/Mage/Cms/Model/Observer.php +++ b/app/code/core/Mage/Cms/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/Model/Page.php b/app/code/core/Mage/Cms/Model/Page.php index 1413e57c00b..8e69213fc31 100644 --- a/app/code/core/Mage/Cms/Model/Page.php +++ b/app/code/core/Mage/Cms/Model/Page.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms Page Model * + * @category Mage + * @package Mage_Cms + * @author Magento Core Team + * * @method Mage_Cms_Model_Resource_Page _getResource() * @method Mage_Cms_Model_Resource_Page getResource() * @method Mage_Cms_Model_Resource_Page_Collection getCollection() @@ -66,10 +71,6 @@ * @method $this setTitle(string $value) * @method string getUpdateTime() * @method $this setUpdateTime(string $value) - * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team */ class Mage_Cms_Model_Page extends Mage_Core_Model_Abstract { @@ -91,10 +92,6 @@ class Mage_Cms_Model_Page extends Mage_Core_Model_Abstract */ protected $_eventPrefix = 'cms_page'; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cms/page'); diff --git a/app/code/core/Mage/Cms/Model/Resource/Block.php b/app/code/core/Mage/Cms/Model/Resource/Block.php index f59cb1b163b..d2caca43ef2 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Block.php +++ b/app/code/core/Mage/Cms/Model/Resource/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Cms_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cms/block', 'block_id'); diff --git a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php index 63554b888d6..41ca3c3a358 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php +++ b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Page.php b/app/code/core/Mage/Cms/Model/Resource/Page.php index 50d9f1cfdf2..f5e91ec3385 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms page mysql resource * - * @category Mage - * @package Mage_Cms - * @author Magento Core Team + * @category Mage + * @package Mage_Cms + * @author Magento Core Team */ class Mage_Cms_Model_Resource_Page extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,10 +35,6 @@ class Mage_Cms_Model_Resource_Page extends Mage_Core_Model_Resource_Db_Abstract */ protected $_store = null; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('cms/page', 'page_id'); diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php index fe20f6a2d28..db0abfe4aeb 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Service.php b/app/code/core/Mage/Cms/Model/Resource/Page/Service.php index 5b1aa42becb..a22ccfd0b42 100644 --- a/app/code/core/Mage/Cms/Model/Resource/Page/Service.php +++ b/app/code/core/Mage/Cms/Model/Resource/Page/Service.php @@ -7,20 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cms page service resource model * + * @category Mage + * @package Mage_Cms * @author Magento Core Team */ class Mage_Cms_Model_Resource_Page_Service extends Mage_Core_Model_Resource_Db_Abstract diff --git a/app/code/core/Mage/Cms/Model/Template/Filter.php b/app/code/core/Mage/Cms/Model/Template/Filter.php index b928ab3d957..93f473b9704 100644 --- a/app/code/core/Mage/Cms/Model/Template/Filter.php +++ b/app/code/core/Mage/Cms/Model/Template/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php index ca43f0c8071..5b14198ee55 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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..ccd94caf2b6 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -110,7 +111,6 @@ public function getFilesCollection($path, $type = null) } } - /** @var Varien_Data_Collection_Filesystem $collection */ $collection = $this->getCollection($path) ->setCollectDirs(false) ->setCollectFiles(true) @@ -311,7 +311,7 @@ public function uploadFile($targetPath, $type = null) * Thumbnail path getter * * @param string $filePath original file path - * @param boolean $checkFile OPTIONAL is it necessary to check file availability + * @param bool $checkFile OPTIONAL is it necessary to check file availability * @return string | false */ public function getThumbnailPath($filePath, $checkFile = false) @@ -333,7 +333,7 @@ public function getThumbnailPath($filePath, $checkFile = false) * Thumbnail URL getter * * @param string $filePath original file path - * @param boolean $checkFile OPTIONAL is it necessary to check file availability + * @param bool $checkFile OPTIONAL is it necessary to check file availability * @return string|false */ public function getThumbnailUrl($filePath, $checkFile = false) diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php index f7f7226690c..372e0585e09 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/controllers/IndexController.php b/app/code/core/Mage/Cms/controllers/IndexController.php index a1f7fcb3fcc..01a23787e7e 100644 --- a/app/code/core/Mage/Cms/controllers/IndexController.php +++ b/app/code/core/Mage/Cms/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/controllers/PageController.php b/app/code/core/Mage/Cms/controllers/PageController.php index f57215f6092..554271ed822 100644 --- a/app/code/core/Mage/Cms/controllers/PageController.php +++ b/app/code/core/Mage/Cms/controllers/PageController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php index f894a7e04d1..7d5b5555292 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php index 09ede091280..7912bc1810f 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php index 7231cf06d12..1f0be198356 100644 --- a/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/etc/adminhtml.xml b/app/code/core/Mage/Cms/etc/adminhtml.xml index 99b380802b1..1c146f4f7e0 100644 --- a/app/code/core/Mage/Cms/etc/adminhtml.xml +++ b/app/code/core/Mage/Cms/etc/adminhtml.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. (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/Cms/etc/config.xml b/app/code/core/Mage/Cms/etc/config.xml index f014de2ea06..fbb245978c0 100644 --- a/app/code/core/Mage/Cms/etc/config.xml +++ b/app/code/core/Mage/Cms/etc/config.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. (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/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml index 49477500519..5b652c036e7 100644 --- a/app/code/core/Mage/Cms/etc/system.xml +++ b/app/code/core/Mage/Cms/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..1e16b799a21 100644 --- a/app/code/core/Mage/Cms/etc/widget.xml +++ b/app/code/core/Mage/Cms/etc/widget.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. (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/Cms/sql/cms_setup/install-1.6.0.0.php b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php index caba92bb8b0..f33f229f438 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php index 5ae334456f4..ce1886ed30a 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php index bacbdcd5554..0c7bdfc7bf3 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php index ef8f636cd45..5e84c56afe8 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php index c1cf0ff14ee..94d94a578df 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $pageTable = $installer->getTable('cms/page'); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php index 81a83c472bc..8fc0b00176e 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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(); if ($installer->getTable('cms_widget')) { diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php index ce4f6fa4a5a..e4253424baa 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn( diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php index 992c9d7d71e..2aabaddfaf7 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php index badd295d76a..73f16971c1a 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php index b6e46d5f30a..ed545705db1 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->dropKey($this->getTable('cms/page'), 'identifier'); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php index e2735d48a5b..6c99cac84b6 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ -$connection = $installer->getConnection(); +$installer = $this; +$installer->startSetup(); + /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$connection = $installer->getConnection(); -$installer->startSetup(); $now = Varien_Date::now(); $connection->insert($installer->getTable('cms/page'), [ 'title' => 'Enable Cookies', diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php index 4341ba50da3..377efc72a83 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,22 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $table = $installer->getTable('cms_widget'); - $installer->run(' CREATE TABLE IF NOT EXISTS `' . $table . '` ( `widget_id` int(10) unsigned NOT NULL auto_increment, diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php index 7224f092980..74193dedd68 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $pageTable = $installer->getTable('cms/page'); $blockTable = $installer->getTable('cms/block'); diff --git a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 015b0c81bf7..98049eb287b 100644 --- a/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cms + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php index 67839c159fe..c9f3b52568c 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 @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Media/Js/Abstract.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php index 69d5cc43a00..8f13c099820 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/List.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/List.php index e5de5668ce1..afc8f6f3f2e 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/List.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/List.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_ConfigurableSwatches_Block_Catalog_Media_Js_List + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Block_Catalog_Media_Js_List extends Mage_ConfigurableSwatches_Block_Catalog_Media_Js_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Product.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Product.php index 2bd244db0f3..dc9e37552f1 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Product.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Product.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Block_Catalog_Media_Js_Product extends Mage_ConfigurableSwatches_Block_Catalog_Media_Js_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php index 6d49fe67c82..675d4983d0f 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php +++ b/app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_ConfigurableSwatches_Block_Catalog_Product_List_Price * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team + * * @method Mage_Eav_Model_Entity_Collection_Abstract getProductCollection() */ class Mage_ConfigurableSwatches_Block_Catalog_Product_List_Price extends Mage_Core_Block_Template 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..7991c68597d 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 @@ -8,20 +8,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..14ac810e39f 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Data.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -30,6 +31,8 @@ class Mage_ConfigurableSwatches_Helper_Data extends Mage_Core_Helper_Abstract const CONFIG_PATH_SWATCH_ATTRIBUTES = 'configswatches/general/swatch_attributes'; const CONFIG_PATH_LIST_SWATCH_ATTRIBUTE = 'configswatches/general/product_list_attribute'; + protected $_moduleName = 'Mage_ConfigurableSwatches'; + protected $_enabled = null; protected $_configAttributeIds = null; @@ -118,17 +121,17 @@ public function attrIsSwatchType($attr) /** * Get swatches product javascript * - * @return string | null + * @return string|null */ public function getSwatchesProductJs() { - /** - * @var Mage_Catalog_Model_Product $product - */ + /** @var Mage_Catalog_Model_Product $product */ $product = Mage::registry('current_product'); if ($this->isEnabled() && $product) { $configAttrs = $this->getSwatchAttributeIds(); - $configurableAttributes = $product->getTypeInstance(true)->getConfigurableAttributesAsArray($product); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $configurableAttributes = $productType->getConfigurableAttributesAsArray($product); foreach ($configurableAttributes as $configurableAttribute) { if (in_array($configurableAttribute['attribute_id'], $configAttrs)) { return 'js/configurableswatches/swatches-product.js'; diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php b/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php index 600427ce827..6ed96fb9e4f 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class implementing price change for swatches in product listing pages + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_List_Price extends Mage_Core_Helper_Abstract { @@ -28,6 +33,8 @@ class Mage_ConfigurableSwatches_Helper_List_Price extends Mage_Core_Helper_Abstr */ const XML_PATH_SWATCH_PRICE = 'configswatches/general/product_list_price_change'; + protected $_moduleName = 'Mage_ConfigurableSwatches'; + /** * Set swatch_price on products where swatch option_id is set * Depends on following product data: diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php index 8ec630141fc..fe1fc97f44d 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php @@ -7,24 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class implementing the media fallback layer for swatches + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Mediafallback extends Mage_Core_Helper_Abstract { const MEDIA_GALLERY_ATTRIBUTE_CODE = 'media_gallery'; + protected $_moduleName = 'Mage_ConfigurableSwatches'; + /** * Set child_attribute_label_mapping on products with attribute label -> product mapping * Depends on following product data: @@ -113,10 +120,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st } // using default value as key unless store-specific label is present - $optionLabel = $optionLabels[$optionId][0]; - if (isset($optionLabels[$optionId][$storeId])) { - $optionLabel = $optionLabels[$optionId][$storeId]; - } + $optionLabel = $optionLabels[$optionId][$storeId] ?? $optionLabels[$optionId][0]; // initialize arrays if not present if (!isset($mapping[$optionLabel])) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php index ee39cbc332a..ee2b23205c2 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php @@ -7,22 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_ConfigurableSwatches_Helper_Productimg + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Productimg extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_ConfigurableSwatches'; + /** * This array stores product images and separates them: * One group keyed by labels that match attribute values, another for all other images @@ -67,9 +74,8 @@ public function getProductImgByLabel($text, $product, $type = null) $text = Mage_ConfigurableSwatches_Helper_Data::normalizeKey($text); $resultImages = [ - 'standard' => isset($images[$text]) ? $images[$text] : null, - 'swatch' => isset($images[$text . self::SWATCH_LABEL_SUFFIX]) ? $images[$text . self::SWATCH_LABEL_SUFFIX] - : null, + 'standard' => $images[$text] ?? null, + 'swatch' => $images[$text . self::SWATCH_LABEL_SUFFIX] ?? null, ]; if (!is_null($type) && array_key_exists($type, $resultImages)) { @@ -103,7 +109,9 @@ public function indexProductImages($product, $preValues = null) $searchValues[] = $value; } } else { // we get them from all config attributes if no pre-defined list is passed in - $attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product); + /** @var Mage_Catalog_Model_Product_Type_Configurable $productType */ + $productType = $product->getTypeInstance(true); + $attributes = $productType->getConfigurableAttributes($product); // Collect valid values of image type attributes foreach ($attributes as $attribute) { @@ -270,7 +278,7 @@ public function getGlobalSwatchUrl( * @param string $tag * @param int $width * @param int $height - * @return string + * @return false|string */ protected function _resizeSwatchImage($filename, $tag, $width, $height) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php index 2053ec60be1..49a86cb454c 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php @@ -7,22 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_ConfigurableSwatches_Helper_Productlist + * + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Helper_Productlist extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_ConfigurableSwatches'; + /** * ID of attribute to be used for swatches on product listing * @@ -130,7 +137,7 @@ protected function _getSwatchAttributeFilteredValue() * See if the swatch matches a filter currently applied to the product list. * * @param int $optionId - * @return boolean + * @return bool */ public function swatchMatchesFilter($optionId) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php index c2dc0f02fc0..c213c55f8fc 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -30,6 +35,8 @@ class Mage_ConfigurableSwatches_Helper_Swatchdimensions extends Mage_Core_Helper const DIM_WIDTH = 'width'; const DIM_HEIGHT = 'height'; + protected $_moduleName = 'Mage_ConfigurableSwatches'; + /** * The buffer between the "inner" and "outer" dimensions of a swatch * diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php b/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php index 4c468a7e12c..9f8c923dbdb 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Observer.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Model_Observer extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php index 93f05743076..edca9794942 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php index 9ff0c88cb78..a91b0b5adfd 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php index e7230dfdd9c..5e5809ef287 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute.php b/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute.php index 64094e08a8a..93e8a380795 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute/Select.php b/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute/Select.php index 05c3125ae8b..d93154fd3b4 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute/Select.php +++ b/app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute/Select.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ConfigurableSwatches + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_ConfigurableSwatches + * @author Magento Core Team */ class Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute_Select extends Mage_ConfigurableSwatches_Model_System_Config_Source_Catalog_Product_Configattribute { diff --git a/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml b/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml index f44aad3c40c..84272774257 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.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. (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/etc/config.xml b/app/code/core/Mage/ConfigurableSwatches/etc/config.xml index 43df54fa545..d2e17a8cb46 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/config.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/config.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. (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/etc/jstranslator.xml b/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml index 53f7d7fb6a7..7b8570a9c6f 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.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. (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/etc/system.xml b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml index 7f42e65f3e7..eeaa1df8f26 100644 --- a/app/code/core/Mage/ConfigurableSwatches/etc/system.xml +++ b/app/code/core/Mage/ConfigurableSwatches/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/Helper/Data.php b/app/code/core/Mage/Contacts/Helper/Data.php index d70a2c7b12d..137cc7bc426 100644 --- a/app/code/core/Mage/Contacts/Helper/Data.php +++ b/app/code/core/Mage/Contacts/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Contacts_Helper_Data extends Mage_Core_Helper_Abstract { const XML_PATH_ENABLED = 'contacts/contacts/enabled'; + protected $_moduleName = 'Mage_Contacts'; + /** * @return bool */ diff --git a/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php b/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php index 67ca4dc2937..a5e4e64f864 100644 --- a/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php +++ b/app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cache cleaner backend model * + * @category Mage + * @package Mage_Contacts + * @author Magento Core Team */ class Mage_Contacts_Model_System_Config_Backend_Links extends Mage_Adminhtml_Model_System_Config_Backend_Cache { /** * Cache tags to clean - * * @var array */ protected $_cacheTags = [Mage_Core_Model_Store::CACHE_TAG, Mage_Cms_Model_Block::CACHE_TAG]; diff --git a/app/code/core/Mage/Contacts/controllers/IndexController.php b/app/code/core/Mage/Contacts/controllers/IndexController.php index 88dd6bf468b..e01a69ac747 100644 --- a/app/code/core/Mage/Contacts/controllers/IndexController.php +++ b/app/code/core/Mage/Contacts/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +34,7 @@ class Mage_Contacts_IndexController extends Mage_Core_Controller_Front_Action const XML_PATH_ENABLED = 'contacts/contacts/enabled'; /** - * @return Mage_Core_Controller_Front_Action|void + * @return void */ public function preDispatch() { diff --git a/app/code/core/Mage/Contacts/etc/adminhtml.xml b/app/code/core/Mage/Contacts/etc/adminhtml.xml index 216447a519c..f52e4bce4ea 100644 --- a/app/code/core/Mage/Contacts/etc/adminhtml.xml +++ b/app/code/core/Mage/Contacts/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 255a434abff..69b88ce001b 100644 --- a/app/code/core/Mage/Contacts/etc/config.xml +++ b/app/code/core/Mage/Contacts/etc/config.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. (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/Contacts/etc/system.xml b/app/code/core/Mage/Contacts/etc/system.xml index 439c5a03a55..0a32c4cd3cb 100644 --- a/app/code/core/Mage/Contacts/etc/system.xml +++ b/app/code/core/Mage/Contacts/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php index eca313857b4..6e59f0a12cf 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php index 94f52040e4e..763b01a4c11 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php index e93350fd711..54da7d10ee9 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php @@ -7,16 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; \ No newline at end of file diff --git a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php index 54ea3b3325f..b681e5d0994 100644 --- a/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Contacts + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" UPDATE {$this->getTable('core_email_template')} SET `template_text` = 'Name: {{var data.name}}\r\nE-mail: {{var data.email}}\r\nTelephone: {{var data.telephone}}\r\n\r\nComment: {{var data.comment}}' WHERE template_code = 'Contact Form (Plain)'; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php index ac825d26e1b..d1be85b823e 100644 --- a/app/code/core/Mage/Core/Block/Abstract.php +++ b/app/code/core/Mage/Core/Block/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -138,7 +139,7 @@ abstract class Mage_Core_Block_Abstract extends Varien_Object /** * Whether this block was not explicitly named * - * @var boolean + * @var bool */ protected $_isAnonymous = false; @@ -569,8 +570,8 @@ public function getChild($name = '') * Retrieve child block HTML * * @param string $name - * @param boolean $useCache - * @param boolean $sorted + * @param bool $useCache + * @param bool $sorted * @return string */ public function getChildHtml($name = '', $useCache = true, $sorted = false) @@ -631,7 +632,7 @@ public function getSortedChildBlocks() * Retrieve child block HTML * * @param string $name - * @param boolean $useCache + * @param bool $useCache * @return string */ protected function _getChildHtml($name, $useCache = true) @@ -685,7 +686,7 @@ public function getBlockHtml($name) * * @param Mage_Core_Block_Abstract|string $block * @param string $siblingName - * @param boolean $after + * @param bool $after * @param string $alias * @return object $this */ @@ -744,7 +745,7 @@ public function insert($block, $siblingName = '', $after = false, $alias = '') /** * Sort block's children * - * @param boolean $force force re-sort all children + * @param bool $force force re-sort all children * @return $this */ public function sortChildren($force = false) @@ -1302,7 +1303,9 @@ protected function _afterCacheUrl($html) if ($this->_getApp()->useCache(self::CACHE_GROUP)) { $this->_getApp()->setUseSessionVar(false); Varien_Profiler::start('CACHE_URL'); - $html = Mage::getSingleton($this->_getUrlModelClass())->sessionUrlVar($html); + /** @var Mage_Core_Model_Url $model */ + $model = Mage::getSingleton($this->_getUrlModelClass()); + $html = $model->sessionUrlVar($html); Varien_Profiler::stop('CACHE_URL'); } return $html; @@ -1402,7 +1405,7 @@ public function addModelTags(Mage_Core_Model_Abstract $model) /** * Get block cache life time * - * @return int + * @return int|null */ public function getCacheLifetime() { diff --git a/app/code/core/Mage/Core/Block/Flush.php b/app/code/core/Mage/Core/Block/Flush.php index 76ab05e2bea..4e876aa4be1 100644 --- a/app/code/core/Mage/Core/Block/Flush.php +++ b/app/code/core/Mage/Core/Block/Flush.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Calendar.php b/app/code/core/Mage/Core/Block/Html/Calendar.php index 7f5c74c417f..475b2ace0a2 100644 --- a/app/code/core/Mage/Core/Block/Html/Calendar.php +++ b/app/code/core/Mage/Core/Block/Html/Calendar.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -81,7 +82,7 @@ protected function _toHtml() /** * Return offset of current timezone with GMT in seconds * - * @return integer + * @return int */ public function getTimezoneOffsetSeconds() { diff --git a/app/code/core/Mage/Core/Block/Html/Date.php b/app/code/core/Mage/Core/Block/Html/Date.php index 103991bacba..b0097e22ea2 100644 --- a/app/code/core/Mage/Core/Block/Html/Date.php +++ b/app/code/core/Mage/Core/Block/Html/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Html/Link.php b/app/code/core/Mage/Core/Block/Html/Link.php index dade68d26db..8eb0aca3564 100644 --- a/app/code/core/Mage/Core/Block/Html/Link.php +++ b/app/code/core/Mage/Core/Block/Html/Link.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,22 +24,17 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Block_Html_Link extends Mage_Core_Block_Template { - - /** - * Internal constructor - * - */ protected function _construct() { $this->setTemplate('core/link.phtml'); parent::_construct(); } /** - * Prepare link attributes as serialized and formated string + * Prepare link attributes as serialized and formatted string * * @return string */ diff --git a/app/code/core/Mage/Core/Block/Html/Select.php b/app/code/core/Mage/Core/Block/Html/Select.php index 7b78f6ae7a7..3191e8184c8 100644 --- a/app/code/core/Mage/Core/Block/Html/Select.php +++ b/app/code/core/Mage/Core/Block/Html/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -209,7 +210,7 @@ protected function _toHtml() * Return option HTML node * * @param array $option - * @param boolean $selected + * @param bool $selected * @return string */ protected function _optionToHtml($option, $selected = false) diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php index 2ca8f1a29ce..b2424223685 100644 --- a/app/code/core/Mage/Core/Block/Messages.php +++ b/app/code/core/Mage/Core/Block/Messages.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Block_Messages extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Core/Block/Profiler.php b/app/code/core/Mage/Core/Block/Profiler.php index 0e285af886c..06b53c32cf8 100644 --- a/app/code/core/Mage/Core/Block/Profiler.php +++ b/app/code/core/Mage/Core/Block/Profiler.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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_Profiler extends Mage_Core_Block_Abstract { /** diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php index c178dbfb736..c1c2db1bca2 100644 --- a/app/code/core/Mage/Core/Block/Store/Switcher.php +++ b/app/code/core/Mage/Core/Block/Store/Switcher.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..9c8556951fb 100644 --- a/app/code/core/Mage/Core/Block/Template.php +++ b/app/code/core/Mage/Core/Block/Template.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -165,7 +166,7 @@ public function setScriptPath($dir) if (strpos($dir, '..') === false && ($dir === Mage::getBaseDir('design') || strpos(realpath($dir), realpath(Mage::getBaseDir('design'))) === 0)) { $this->_viewDir = $dir; } else { - Mage::log('Not valid script path:' . $dir, Zend_Log::CRIT, null, null, true); + Mage::log('Not valid script path:' . $dir, Zend_Log::CRIT, null, true); } return $this; } @@ -259,9 +260,12 @@ public function fetchView($fileName) $thisClass = get_class($this); Mage::log('Not valid template file:' . $fileName . ' class: ' . $thisClass, Zend_Log::CRIT, null, true); } - } catch (Exception $e) { + } catch (Throwable $e) { ob_get_clean(); - throw $e; + if (Mage::getIsDeveloperMode()) { + throw $e; + } + Mage::logException($e); } if ($hints) { diff --git a/app/code/core/Mage/Core/Block/Template/Facade.php b/app/code/core/Mage/Core/Block/Template/Facade.php index 8fad2815c4b..dc9bfb7fe1a 100644 --- a/app/code/core/Mage/Core/Block/Template/Facade.php +++ b/app/code/core/Mage/Core/Block/Template/Facade.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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..1ab4c7ca0d4 100644 --- a/app/code/core/Mage/Core/Block/Template/Smarty.php +++ b/app/code/core/Mage/Core/Block/Template/Smarty.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2b1ed257672 100644 --- a/app/code/core/Mage/Core/Block/Template/Zend.php +++ b/app/code/core/Mage/Core/Block/Template/Zend.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..d88a2ae1349 100644 --- a/app/code/core/Mage/Core/Block/Text.php +++ b/app/code/core/Mage/Core/Block/Text.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/List.php b/app/code/core/Mage/Core/Block/Text/List.php index 94daeb5bac4..f142d3d845c 100644 --- a/app/code/core/Mage/Core/Block/Text/List.php +++ b/app/code/core/Mage/Core/Block/Text/List.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Base html block * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Block_Text_List extends Mage_Core_Block_Text { diff --git a/app/code/core/Mage/Core/Block/Text/List/Item.php b/app/code/core/Mage/Core/Block/Text/List/Item.php index 2cd18c9805c..2ec8024638c 100644 --- a/app/code/core/Mage/Core/Block/Text/List/Item.php +++ b/app/code/core/Mage/Core/Block/Text/List/Item.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * List item block * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Block_Text_List_Item extends Mage_Core_Block_Text { diff --git a/app/code/core/Mage/Core/Block/Text/List/Link.php b/app/code/core/Mage/Core/Block/Text/List/Link.php index 41336250bde..3ae2b9be3d5 100644 --- a/app/code/core/Mage/Core/Block/Text/List/Link.php +++ b/app/code/core/Mage/Core/Block/Text/List/Link.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Base html block * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Block_Text_List_Link extends Mage_Core_Block_Text { diff --git a/app/code/core/Mage/Core/Block/Text/Tag.php b/app/code/core/Mage/Core/Block/Text/Tag.php index ac9a0168ac7..90af3d07a03 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag.php +++ b/app/code/core/Mage/Core/Block/Text/Tag.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +34,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/Block/Text/Tag/Css.php b/app/code/core/Mage/Core/Block/Text/Tag/Css.php index ced6dabde1e..6710ab8a189 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Css.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Css.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php index 5d0dd932d06..d7dfa59ca79 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php index 7d2aa7909f7..4d54f484c72 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Debug.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Debug.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Js.php b/app/code/core/Mage/Core/Block/Text/Tag/Js.php index 53927470747..c185f6f27fa 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Js.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Js.php @@ -7,28 +7,30 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 $this setTagName(string $value) * @method $this setTagParams(array $value) */ class Mage_Core_Block_Text_Tag_Js extends Mage_Core_Block_Text_Tag { - protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php index 4de70faabf5..1c4d04388b9 100644 --- a/app/code/core/Mage/Core/Block/Text/Tag/Meta.php +++ b/app/code/core/Mage/Core/Block/Text/Tag/Meta.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 string getContentType() * @method $this setContentType(string $value) * @method string getTitle() diff --git a/app/code/core/Mage/Core/Controller/Front/Action.php b/app/code/core/Mage/Core/Controller/Front/Action.php index 460e9c32445..f30a62bb530 100644 --- a/app/code/core/Mage/Core/Controller/Front/Action.php +++ b/app/code/core/Mage/Core/Controller/Front/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Front/Router.php b/app/code/core/Mage/Core/Controller/Front/Router.php index 9c1dc9c0f21..a3e419eb828 100644 --- a/app/code/core/Mage/Core/Controller/Front/Router.php +++ b/app/code/core/Mage/Core/Controller/Front/Router.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Front_Router { protected $_config = null; diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php index 5944360a04f..af233b0d6ff 100644 --- a/app/code/core/Mage/Core/Controller/Request/Http.php +++ b/app/code/core/Mage/Core/Controller/Request/Http.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,7 +83,7 @@ class Mage_Core_Controller_Request_Http extends Zend_Controller_Request_Http * This value is calculated instead of reading PATH_INFO * directly from $_SERVER due to cross-platform differences. * - * @return string + * @return string 'something.html'|'/'|'/path0'|'/path0/path1/'|'/path0/path1/path2'|etc */ public function getOriginalPathInfo() { @@ -162,7 +163,7 @@ public function setPathInfo($pathInfo = null) $stores = Mage::app()->getStores(true, true); if ($storeCode!=='' && isset($stores[$storeCode])) { Mage::app()->setCurrentStore($storeCode); - $pathInfo = '/'.(isset($pathParts[1]) ? $pathParts[1] : ''); + $pathInfo = '/'.($pathParts[1] ?? ''); } elseif ($storeCode !== '') { $this->setActionName('noRoute'); } @@ -237,7 +238,6 @@ public function getDirectFrontNames() /** * @return Zend_Controller_Request_Http - * @throws Zend_Controller_Request_Exception */ public function getOriginalRequest() { @@ -323,7 +323,7 @@ public function getScheme() * Retrieve HTTP HOST * * @param bool $trimPort - * @return string + * @return false|string */ public function getHttpHost($trimPort = true) { @@ -424,10 +424,7 @@ public function getActionName() public function getAlias($name) { $aliases = $this->getAliases(); - if (isset($aliases[$name])) { - return $aliases[$name]; - } - return null; + return $aliases[$name] ?? null; } /** @@ -437,10 +434,7 @@ public function getAlias($name) */ public function getAliases() { - if (isset($this->_routingInfo['aliases'])) { - return $this->_routingInfo['aliases']; - } - return parent::getAliases(); + return $this->_routingInfo['aliases'] ?? parent::getAliases(); } /** @@ -568,7 +562,7 @@ public function isStraight($flag = null) /** * Check is Request from AJAX * - * @return boolean + * @return bool */ public function isAjax() { @@ -584,7 +578,7 @@ public function isAjax() /** * Define that request was forwarded internally * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setInternallyForwarded($flag = true) diff --git a/app/code/core/Mage/Core/Controller/Response/Http.php b/app/code/core/Mage/Core/Controller/Response/Http.php index 48612e402ac..c4b70c4a2bb 100644 --- a/app/code/core/Mage/Core/Controller/Response/Http.php +++ b/app/code/core/Mage/Core/Controller/Response/Http.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php index 252abc2133b..54f21970355 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Action.php +++ b/app/code/core/Mage/Core/Controller/Varien/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -122,8 +123,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 @@ -868,7 +867,7 @@ protected function _getRealModuleName() * 1. core_module/core_controller/core_action to new_module/new_controller/new_action * 2. all other actions of core_module/core_controller to new_module/new_controller * - * @return boolean true if rewrite happened + * @return bool true if rewrite happened */ protected function _rewrite() { @@ -931,7 +930,7 @@ protected function _validateFormKey() * bar / * * @see self::_renderTitles() - * @param string|false|-1|null $text + * @param string|false|int|null $text * @param bool $resetIfExists * @return $this */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Exception.php b/app/code/core/Mage/Core/Controller/Varien/Exception.php index 790852d8194..00e6186be59 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Exception.php +++ b/app/code/core/Mage/Core/Controller/Varien/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php index 1da67b4f6cf..f240e5d7807 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Front.php +++ b/app/code/core/Mage/Core/Controller/Varien/Front.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,10 +114,7 @@ public function addRouter($name, Mage_Core_Controller_Varien_Router_Abstract $ro */ public function getRouter($name) { - if (isset($this->_routers[$name])) { - return $this->_routers[$name]; - } - return false; + return $this->_routers[$name] ?? false; } /** @@ -372,7 +370,7 @@ protected function _checkBaseUrl($request) * Check if requested path starts with one of the admin front names * * @param Zend_Controller_Request_Http $request - * @return boolean + * @return bool */ protected function _isAdminFrontNameMatched($request) { @@ -393,7 +391,6 @@ protected function _isAdminFrontNameMatched($request) if (is_array($adminFrontNameNodes)) { foreach ($adminFrontNameNodes as $frontNameNode) { - /** @var SimpleXMLElement $frontNameNode */ $adminFrontNames[] = (string)$frontNameNode; } } diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php index 17c50774e85..cff793259bc 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php index dbaf8c4150e..1f58cf0745a 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php index 588e2fae7ba..471e56642f4 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Default.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Core_Controller_Varien_Router_Default extends Mage_Core_Controller_Va * change store to default (Possible when enabled Store Code in URL) * * @param Zend_Controller_Request_Http $request - * @return boolean + * @return bool */ public function match(Zend_Controller_Request_Http $request) { @@ -70,7 +71,7 @@ protected function _getNoRouteConfig() /** * Check if store is admin store * - * @return boolean + * @return bool */ protected function _isAdmin() { 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..52da9df2665 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 = []; @@ -281,7 +287,7 @@ protected function _noRouteShouldBeApplied() * Check if current controller instance is allowed in current router. * * @param Mage_Core_Controller_Varien_Action $controllerInstance - * @return boolean + * @return bool */ protected function _validateControllerInstance($controllerInstance) { @@ -294,7 +300,7 @@ protected function _validateControllerInstance($controllerInstance) * * @param string $realModule * @param string $controller - * @return mixed + * @return false|string * @throws Mage_Core_Exception */ protected function _validateControllerClassName($realModule, $controller) @@ -371,10 +377,7 @@ public function addModule($frontName, $moduleNames, $routeName) */ public function getModuleByFrontName($frontName) { - if (isset($this->_modules[$frontName])) { - return $this->_modules[$frontName]; - } - return false; + return $this->_modules[$frontName] ?? false; } /** @@ -399,10 +402,7 @@ public function getModuleByName($moduleName, $modules) */ public function getFrontNameByRoute($routeName) { - if (isset($this->_routes[$routeName])) { - return $this->_routes[$routeName]; - } - return false; + return $this->_routes[$routeName] ?? false; } /** diff --git a/app/code/core/Mage/Core/Exception.php b/app/code/core/Mage/Core/Exception.php index 34d40c62c69..ab60ba81a98 100644 --- a/app/code/core/Mage/Core/Exception.php +++ b/app/code/core/Mage/Core/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +58,7 @@ public function getMessages($type = '') } return $arrRes; } - return isset($this->_messages[$type]) ? $this->_messages[$type] : []; + return $this->_messages[$type] ?? []; } /** diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php index 641a9292616..fdafd8196a0 100644 --- a/app/code/core/Mage/Core/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Helper/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -120,7 +121,7 @@ protected function _getModuleName() { if (!$this->_moduleName) { $class = get_class($this); - $this->_moduleName = substr($class, 0, strpos($class, '_Helper')); + $this->_moduleName = implode('_', array_slice(explode('_', $class), 0, 2)); } return $this->_moduleName; } @@ -129,7 +130,7 @@ protected function _getModuleName() * Check whether or not the module output is enabled in Configuration * * @param string $moduleName Full module name - * @return boolean + * @return bool */ public function isModuleOutputEnabled($moduleName = null) { @@ -151,7 +152,7 @@ public function isModuleOutputEnabled($moduleName = null) * Check is module exists and enabled in global config. * * @param string $moduleName the full module name, example Mage_Core - * @return boolean + * @return bool */ public function isModuleEnabled($moduleName = null) { @@ -247,7 +248,7 @@ function ($matches) { } /** - * Wrapper for standart strip_tags() function with extra functionality for html entities + * Wrapper for standard strip_tags() function with extra functionality for html entities * * @param string $data * @param string $allowableTags @@ -401,7 +402,7 @@ public function urlEncode($url) } /** - * base64_dencode() for URLs dencoding + * base64_decode() for URLs decoding * * @param string $url * @return string diff --git a/app/code/core/Mage/Core/Helper/Array.php b/app/code/core/Mage/Core/Helper/Array.php index 2a93535753e..160294c4673 100644 --- a/app/code/core/Mage/Core/Helper/Array.php +++ b/app/code/core/Mage/Core/Helper/Array.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,6 +25,8 @@ */ class Mage_Core_Helper_Array extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Core'; + /** * Merge array recursive without overwrite keys. * PHP function array_merge_recursive merge array diff --git a/app/code/core/Mage/Core/Helper/Cookie.php b/app/code/core/Mage/Core/Helper/Cookie.php index 5b9d6b73721..942966c80a4 100644 --- a/app/code/core/Mage/Core/Helper/Cookie.php +++ b/app/code/core/Mage/Core/Helper/Cookie.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,6 +48,8 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract */ const COOKIE_RESTRICTION_NOTICE_CMS_BLOCK_IDENTIFIER = 'cookie_restriction_notice_block'; + protected $_moduleName = 'Mage_Core'; + /** * Store instance * @@ -76,20 +79,19 @@ class Mage_Core_Helper_Cookie extends Mage_Core_Helper_Abstract */ public function __construct(array $data = []) { - $this->_currentStore = isset($data['current_store']) ? $data['current_store'] : Mage::app()->getStore(); + $this->_currentStore = $data['current_store'] ?? Mage::app()->getStore(); if (!$this->_currentStore instanceof Mage_Core_Model_Store) { throw new InvalidArgumentException('Required store object is invalid'); } - $this->_cookieModel = isset($data['cookie_model']) - ? $data['cookie_model'] : Mage::getSingleton('core/cookie'); + $this->_cookieModel = $data['cookie_model'] ?? Mage::getSingleton('core/cookie'); if (!$this->_cookieModel instanceof Mage_Core_Model_Cookie) { throw new InvalidArgumentException('Required cookie object is invalid'); } - $this->_website = isset($data['website']) ? $data['website'] : Mage::app()->getWebsite(); + $this->_website = $data['website'] ?? Mage::app()->getWebsite(); if (!$this->_website instanceof Mage_Core_Model_Website) { throw new InvalidArgumentException('Required website object is invalid'); diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php index 561a206924d..40f8c4617cb 100644 --- a/app/code/core/Mage/Core/Helper/Data.php +++ b/app/code/core/Mage/Core/Helper/Data.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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 { @@ -56,6 +57,8 @@ class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract */ const DIVIDE_EPSILON = 10000; + protected $_moduleName = 'Mage_Core'; + /** * @var Mage_Core_Model_Encryption */ @@ -268,7 +271,7 @@ public function getRandomString($len, $chars = null) * Generate salted hash from password * * @param string $password - * @param string|integer|boolean $salt + * @param string|int|bool $salt * @return string */ public function getHash($password, $salt = false) @@ -398,7 +401,7 @@ public function isDevAllowed($storeId = null) $allowedIps = Mage::getStoreConfig(self::XML_PATH_DEV_ALLOW_IPS, $storeId); $remoteAddr = Mage::helper('core/http')->getRemoteAddr(); if (!empty($allowedIps) && !empty($remoteAddr)) { - $allowedIps = preg_split('#\s*,\s*#', $allowedIps, null, PREG_SPLIT_NO_EMPTY); + $allowedIps = preg_split('#\s*,\s*#', $allowedIps, -1, PREG_SPLIT_NO_EMPTY); if (array_search($remoteAddr, $allowedIps) === false && array_search(Mage::helper('core/http')->getHttpHost(), $allowedIps) === false) { $allow = false; @@ -452,7 +455,7 @@ public function getCacheBetaTypes() * @param array|Varien_Object $source * @param array|Varien_Object $target * @param string $root - * @return boolean + * @return bool */ public function copyFieldset($fieldset, $aspect, $source, $target, $root = 'global') { @@ -475,7 +478,7 @@ public function copyFieldset($fieldset, $aspect, $source, $target, $root = 'glob } if ($sourceIsArray) { - $value = isset($source[$code]) ? $source[$code] : null; + $value = $source[$code] ?? null; } else { $value = $source->getDataUsingMethod($code); } @@ -680,7 +683,7 @@ public function xmlToAssoc(SimpleXMLElement $xml) * Encode the mixed $valueToEncode into the JSON format * * @param mixed $valueToEncode - * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default + * @param bool $cycleCheck Optional; whether or not to check for object recursion; off by default * @param array $options Additional options used during encoding * @return string */ @@ -776,7 +779,10 @@ public function mergeFiles( } else { $targetMtime = filemtime($targetFile); foreach ($srcFiles as $file) { - if (!file_exists($file) || @filemtime($file) > $targetMtime) { + if (!file_exists($file)) { + // no translation intentionally + throw new Exception(sprintf('File %s not found.', $file)); + } elseif (@filemtime($file) > $targetMtime) { $shouldMerge = true; break; } diff --git a/app/code/core/Mage/Core/Helper/File/Storage.php b/app/code/core/Mage/Core/Helper/File/Storage.php index 78f9f6f0a2b..fa4144aa81e 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage.php +++ b/app/code/core/Mage/Core/Helper/File/Storage.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { + protected $_moduleName = 'Mage_Core'; + /** * Current storage code * diff --git a/app/code/core/Mage/Core/Helper/File/Storage/Database.php b/app/code/core/Mage/Core/Helper/File/Storage/Database.php index d72332453c4..f48b0ca648e 100644 --- a/app/code/core/Mage/Core/Helper/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Helper/File/Storage/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Core_Helper_File_Storage_Database extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Core'; + /** * Database storage model * @var null|Mage_Core_Model_File_Storage_Database diff --git a/app/code/core/Mage/Core/Helper/Hint.php b/app/code/core/Mage/Core/Helper/Hint.php index 9dd91649ffd..e0abe4db94b 100644 --- a/app/code/core/Mage/Core/Helper/Hint.php +++ b/app/code/core/Mage/Core/Helper/Hint.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Core_Helper_Hint extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Core'; + /** * List of available hints * diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php index 317cbd78830..d01983277ec 100644 --- a/app/code/core/Mage/Core/Helper/Http.php +++ b/app/code/core/Mage/Core/Helper/Http.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Core_Helper_Http extends Mage_Core_Helper_Abstract { const XML_NODE_REMOTE_ADDR_HEADERS = 'global/remote_addr_headers'; + protected $_moduleName = 'Mage_Core'; + /** * Remote address cache * @var string @@ -115,7 +118,7 @@ public function getRemoteAddrHeaders() * Retrieve Client Remote Address * * @param bool $ipToLong converting IP to long format - * @return string IPv4|long + * @return false|string IPv4|long */ public function getRemoteAddr($ipToLong = false) { @@ -149,7 +152,7 @@ public function getRemoteAddr($ipToLong = false) * Retrieve Server IP address * * @param bool $ipToLong converting IP to long format - * @return string IPv4|long + * @return false|string IPv4|long */ public function getServerAddr($ipToLong = false) { @@ -164,7 +167,7 @@ public function getServerAddr($ipToLong = false) * Retrieve HTTP "clean" value * * @param string $var - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ protected function _getHttpCleanValue($var, $clean = true) @@ -180,7 +183,7 @@ protected function _getHttpCleanValue($var, $clean = true) /** * Retrieve HTTP HOST * - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ public function getHttpHost($clean = true) @@ -191,7 +194,7 @@ public function getHttpHost($clean = true) /** * Retrieve HTTP USER AGENT * - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ public function getHttpUserAgent($clean = true) @@ -202,7 +205,7 @@ public function getHttpUserAgent($clean = true) /** * Retrieve HTTP ACCEPT LANGUAGE * - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ public function getHttpAcceptLanguage($clean = true) @@ -213,7 +216,7 @@ public function getHttpAcceptLanguage($clean = true) /** * Retrieve HTTP ACCEPT CHARSET * - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ public function getHttpAcceptCharset($clean = true) @@ -224,7 +227,7 @@ public function getHttpAcceptCharset($clean = true) /** * Retrieve HTTP REFERER * - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ public function getHttpReferer($clean = true) @@ -236,7 +239,7 @@ public function getHttpReferer($clean = true) * Returns the REQUEST_URI taking into account * platform differences between Apache and IIS * - * @param boolean $clean clean non UTF-8 characters + * @param bool $clean clean non UTF-8 characters * @return string */ public function getRequestUri($clean = false) @@ -252,7 +255,7 @@ public function getRequestUri($clean = false) * Validate IP address * * @param string $address - * @return boolean + * @return bool */ public function validateIpAddr($address) { diff --git a/app/code/core/Mage/Core/Helper/Js.php b/app/code/core/Mage/Core/Helper/Js.php index 3d3ca604c64..75f1c9147de 100644 --- a/app/code/core/Mage/Core/Helper/Js.php +++ b/app/code/core/Mage/Core/Helper/Js.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * JavaScript helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Js extends Mage_Core_Helper_Abstract { @@ -35,6 +38,8 @@ class Mage_Core_Helper_Js extends Mage_Core_Helper_Abstract */ const JAVASCRIPT_TRANSLATE_CONFIG_FILENAME = 'jstranslator.xml'; + protected $_moduleName = 'Mage_Core'; + /** * Array of senteces of JS translations * diff --git a/app/code/core/Mage/Core/Helper/Security.php b/app/code/core/Mage/Core/Helper/Security.php index 1eb2f08fb56..f3ff5edaf32 100644 --- a/app/code/core/Mage/Core/Helper/Security.php +++ b/app/code/core/Mage/Core/Helper/Security.php @@ -1,8 +1,31 @@ + */ class Mage_Core_Helper_Security { - private $invalidBlockActions = [ // explicitly not using class constant here Mage_Page_Block_Html_Topmenu_Renderer::class diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php index 87a29135351..c81ac155567 100644 --- a/app/code/core/Mage/Core/Helper/String.php +++ b/app/code/core/Mage/Core/Helper/String.php @@ -7,26 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { const ICONV_CHARSET = 'UTF-8'; + protected $_moduleName = 'Mage_Core'; + /** * @var Mage_Core_Helper_Array */ @@ -101,7 +106,7 @@ public function substr($string, $offset, $length = null) * Split string and appending $insert string after $needle * * @param string $str - * @param integer $length + * @param int $length * @param string $needle * @param string $insert * @return string @@ -181,7 +186,7 @@ public function str_split($str, $length = 1, $keepWords = false, $trim = false, } } // split smartly, keeping words else { - $split = preg_split('/(' . $wordSeparatorRegex . '+)/siu', $str, null, PREG_SPLIT_DELIM_CAPTURE); + $split = preg_split('/(' . $wordSeparatorRegex . '+)/siu', $str, -1, PREG_SPLIT_DELIM_CAPTURE); $i = 0; $space = ''; $spaceLen = 0; @@ -251,7 +256,7 @@ public function str_split($str, $length = 1, $keepWords = false, $trim = false, public function splitWords($str, $uniqueOnly = false, $maxWordLength = 0, $wordSeparatorRegexp = '\s') { $result = []; - $split = preg_split('#' . $wordSeparatorRegexp . '#siu', $str, null, PREG_SPLIT_NO_EMPTY); + $split = preg_split('#' . $wordSeparatorRegexp . '#siu', $str, -1, PREG_SPLIT_NO_EMPTY); foreach ($split as $word) { if ($uniqueOnly) { $result[$word] = $word; @@ -283,7 +288,7 @@ public function cleanString($string) * @param string $haystack * @param string $needle * @param int $offset - * @return int|false + * @return int */ public function strpos($haystack, $needle, $offset = null) { @@ -483,7 +488,7 @@ public function getArrayHelper() * Unicode compatible ord() method * * @param string $c char to get value from - * @return integer + * @return int */ public function uniOrd($c) { diff --git a/app/code/core/Mage/Core/Helper/Translate.php b/app/code/core/Mage/Core/Helper/Translate.php index 2d1d178ddce..af48fefb6bf 100644 --- a/app/code/core/Mage/Core/Helper/Translate.php +++ b/app/code/core/Mage/Core/Helper/Translate.php @@ -7,24 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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 { + protected $_moduleName = 'Mage_Core'; + /** * Save translation data to database for specific area * diff --git a/app/code/core/Mage/Core/Helper/UnserializeArray.php b/app/code/core/Mage/Core/Helper/UnserializeArray.php index f343706842d..725b85cec8b 100644 --- a/app/code/core/Mage/Core/Helper/UnserializeArray.php +++ b/app/code/core/Mage/Core/Helper/UnserializeArray.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..8d56378c057 100644 --- a/app/code/core/Mage/Core/Helper/Url.php +++ b/app/code/core/Mage/Core/Helper/Url.php @@ -7,26 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { + protected $_moduleName = 'Mage_Core'; /** * Retrieve current url @@ -132,7 +134,7 @@ public function addRequestParam($url, $param) * * @param string $url * @param string $paramKey - * @param boolean $caseSensitive + * @param bool $caseSensitive * @return string */ public function removeRequestParam($url, $paramKey, $caseSensitive = false) @@ -171,16 +173,11 @@ public function encodePunycode($url) { $parsedUrl = parse_url($url); if (!$this->_isPunycode($parsedUrl['host'])) { - if (function_exists('idn_to_ascii')) { - $host = idn_to_ascii($parsedUrl['host']); - } else { - $idn = new Net_IDNA2(); - $host = $idn->encode($parsedUrl['host']); - } + $host = idn_to_ascii($parsedUrl['host']); return str_replace($parsedUrl['host'], $host, $url); - } else { - return $url; } + + return $url; } /** @@ -188,28 +185,24 @@ public function encodePunycode($url) * * @param string $url decode url from Punycode * @return string + * @throws Exception */ public function decodePunycode($url) { $parsedUrl = parse_url($url); if ($this->_isPunycode($parsedUrl['host'])) { - if (function_exists('idn_to_utf8')) { - $host = idn_to_utf8($parsedUrl['host']); - } else { - $idn = new Net_IDNA2(); - $host = $idn->decode($parsedUrl['host']); - } + $host = idn_to_utf8($parsedUrl['host']); return str_replace($parsedUrl['host'], $host, $url); - } else { - return $url; } + + return $url; } /** * Check domain name for IDN using ACE prefix http://tools.ietf.org/html/rfc3490#section-5 * * @param string $host domain name - * @return boolean + * @return bool */ private function _isPunycode($host) { diff --git a/app/code/core/Mage/Core/Helper/Url/Rewrite.php b/app/code/core/Mage/Core/Helper/Url/Rewrite.php index 87c9b35fab8..eba09ec5433 100644 --- a/app/code/core/Mage/Core/Helper/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Helper/Url/Rewrite.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Url rewrite helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Helper_Url_Rewrite extends Mage_Core_Helper_Abstract { @@ -39,6 +39,8 @@ class Mage_Core_Helper_Url_Rewrite extends Mage_Core_Helper_Abstract */ const TARGET_PATH_ALLOWED_LENGTH = 255; + protected $_moduleName = 'Mage_Core'; + /** * Core func to validate request path * If something is wrong with a path it throws localized error message and error code, diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php index cf5190366bd..eb211d09e0c 100644 --- a/app/code/core/Mage/Core/Model/Abstract.php +++ b/app/code/core/Mage/Core/Model/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -162,7 +163,7 @@ public function dataHasChangedFor($field) /** * Set resource names * - * If collection name is ommited, resource name will be used with _collection appended + * If collection name is omitted, resource name will be used with _collection appended * * @param string $resourceName * @param string|null $resourceCollectionName @@ -212,7 +213,7 @@ public function getIdFieldName() /** * Retrieve model object identifier * - * @return mixed + * @return int|string */ public function getId() { @@ -281,7 +282,7 @@ public function getCollection() /** * Load object data * - * @param string|integer $id + * @param string|int $id * @param string|null $field * @return $this */ @@ -296,7 +297,7 @@ public function load($id, $field = null) } /** - * Get array of objects transfered to default events processing + * Get array of objects transferred to default events processing * * @return array */ @@ -353,7 +354,7 @@ public function afterLoad() * Can be overloaded in child classes to perform advanced check whether model needs to be saved * e.g. usign resouceModel->hasDataChanged() or any other technique * - * @return boolean + * @return bool */ protected function _hasModelChanged() { @@ -413,7 +414,7 @@ public function afterCommitCallback() /** * Check object state (true - if it is object without id on object just created) * This method can help detect if object just created in _afterSave method - * problem is what in after save onject has id and we can't detect what object was + * problem is what in after save object has id and we can't detect what object was * created in this transaction * * @param bool $flag @@ -424,10 +425,7 @@ public function isObjectNew($flag = null) if ($flag !== null) { $this->_isObjectNew = $flag; } - if ($this->_isObjectNew !== null) { - return $this->_isObjectNew; - } - return !(bool)$this->getId(); + return $this->_isObjectNew ?? !(bool)$this->getId(); } /** @@ -473,7 +471,7 @@ public function getCacheTags() } /** - * Get cahce tags associated with object id + * Get cache tags associated with object id * * @return array|bool */ @@ -494,7 +492,7 @@ public function getCacheIdTags() } /** - * Remove model onject related cache + * Remove model object related cache * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index a2afc9897aa..7409efe68ad 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -255,9 +256,6 @@ class Mage_Core_Model_App */ protected $_isInstalled = null; - /** - * Constructor - */ public function __construct() { } @@ -319,7 +317,7 @@ public function baseInit($options) /** * Run light version of application with specified modules support * - * @see Mage_Core_Model_App->run() + * @see Mage_Core_Model_App::run() * * @param string|array $scopeCode * @param string $scopeType @@ -352,7 +350,7 @@ public function initSpecified($scopeCode, $scopeType = null, $options = [], $mod */ public function run($params) { - $options = isset($params['options']) ? $params['options'] : []; + $options = $params['options'] ?? []; $this->baseInit($options); Mage::register('application_params', $params); @@ -363,8 +361,8 @@ public function run($params) $this->loadAreaPart(Mage_Core_Model_App_Area::AREA_GLOBAL, Mage_Core_Model_App_Area::PART_EVENTS); if ($this->_config->isLocalConfigLoaded()) { - $scopeCode = isset($params['scope_code']) ? $params['scope_code'] : ''; - $scopeType = isset($params['scope_type']) ? $params['scope_type'] : 'store'; + $scopeCode = $params['scope_code'] ?? ''; + $scopeType = $params['scope_type'] ?? 'store'; $this->_initCurrentStore($scopeCode, $scopeType); $this->_initRequest(); Mage_Core_Model_Resource_Setup::applyAllDataUpdates(); diff --git a/app/code/core/Mage/Core/Model/App/Area.php b/app/code/core/Mage/Core/Model/App/Area.php index 873d59df234..eee178137c3 100644 --- a/app/code/core/Mage/Core/Model/App/Area.php +++ b/app/code/core/Mage/Core/Model/App/Area.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/App/Emulation.php b/app/code/core/Mage/Core/Model/App/Emulation.php index 527aea5acdc..8cd94fdf7a2 100644 --- a/app/code/core/Mage/Core/Model/App/Emulation.php +++ b/app/code/core/Mage/Core/Model/App/Emulation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,8 +43,6 @@ class Mage_Core_Model_App_Emulation extends Varien_Object protected $_app; /** - * Constructor - * * @param array $args */ public function __construct(array $args = []) @@ -59,9 +58,9 @@ public function __construct(array $args = []) * * Function returns information about initial store environment and emulates environment of another store * - * @param integer $storeId + * @param int $storeId * @param string $area - * @param boolean $emulateStoreInlineTranslation emulate inline translation of the specified store or just disable it + * @param bool $emulateStoreInlineTranslation emulate inline translation of the specified store or just disable it * * @return Varien_Object information about environment of the initial store */ @@ -118,10 +117,10 @@ public function stopEnvironmentEmulation(Varien_Object $initialEnvironmentInfo) * * Function disables inline translation if $storeId is null * - * @param integer|null $storeId + * @param int|null $storeId * @param string $area * - * @return boolean initial inline translation state + * @return bool initial inline translation state */ protected function _emulateInlineTranslation($storeId = null, $area = Mage_Core_Model_App_Area::AREA_FRONTEND) { @@ -143,7 +142,7 @@ protected function _emulateInlineTranslation($storeId = null, $area = Mage_Core_ /** * Apply design of the specified store * - * @param integer $storeId + * @param int $storeId * @param string $area * * @return array initial design parameters(package, store, area) @@ -163,7 +162,7 @@ protected function _emulateDesign($storeId, $area = Mage_Core_Model_App_Area::AR /** * Apply locale of the specified store * - * @param integer $storeId + * @param int $storeId * @param string $area * * @return string initial locale code @@ -194,7 +193,7 @@ protected function _getStoreConfig($path, $store = null) /** * Restore initial inline translation state * - * @param boolean $initialTranslateInline + * @param bool $initialTranslateInline * * @return $this */ diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php index 14fbef27651..f8838bddc0f 100644 --- a/app/code/core/Mage/Core/Model/Cache.php +++ b/app/code/core/Mage/Core/Model/Cache.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -113,12 +114,11 @@ class Mage_Core_Model_Cache */ public function __construct(array $options = []) { - $this->_defaultBackendOptions['cache_dir'] = isset($options['cache_dir']) ? $options['cache_dir'] : - Mage::getBaseDir('cache'); + $this->_defaultBackendOptions['cache_dir'] = $options['cache_dir'] ?? Mage::getBaseDir('cache'); /** * Initialize id prefix */ - $this->_idPrefix = isset($options['id_prefix']) ? $options['id_prefix'] : ''; + $this->_idPrefix = $options['id_prefix'] ?? ''; if (!$this->_idPrefix && isset($options['prefix'])) { $this->_idPrefix = $options['prefix']; } @@ -157,7 +157,7 @@ public function __construct(array $options = []) protected function _getBackendOptions(array $cacheOptions) { $enable2levels = false; - $type = isset($cacheOptions['backend']) ? $cacheOptions['backend'] : $this->_defaultBackend; + $type = $cacheOptions['backend'] ?? $this->_defaultBackend; if (isset($cacheOptions['backend_options']) && is_array($cacheOptions['backend_options'])) { $options = $cacheOptions['backend_options']; } else { @@ -317,13 +317,12 @@ protected function _getTwoLevelsBackendOptions($fastOptions, $cacheOptions) */ protected function _getFrontendOptions(array $cacheOptions) { - $options = isset($cacheOptions['frontend_options']) ? $cacheOptions['frontend_options'] : []; + $options = $cacheOptions['frontend_options'] ?? []; if (!array_key_exists('caching', $options)) { $options['caching'] = true; } if (!array_key_exists('lifetime', $options)) { - $options['lifetime'] = isset($cacheOptions['lifetime']) ? $cacheOptions['lifetime'] - : self::DEFAULT_LIFETIME; + $options['lifetime'] = $cacheOptions['lifetime'] ?? self::DEFAULT_LIFETIME; } if (!array_key_exists('automatic_cleaning_factor', $options)) { $options['automatic_cleaning_factor'] = 0; diff --git a/app/code/core/Mage/Core/Model/Calculator.php b/app/code/core/Mage/Core/Model/Calculator.php index 93c301e5057..ee58536bf6e 100644 --- a/app/code/core/Mage/Core/Model/Calculator.php +++ b/app/code/core/Mage/Core/Model/Calculator.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index e2dd065d665..0de67e4cf8c 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -1179,7 +1180,7 @@ public function getBaseDir($type = 'base') * * @param string $path * @param string $type - * @return string + * @return false|string */ public function getVarDir($path = null, $type = 'var') { @@ -1240,7 +1241,7 @@ public function getModuleDir($type, $moduleName) * Load event observers for an area (front, admin) * * @param string $area - * @return boolean + * @return bool */ public function loadEventObservers($area) { diff --git a/app/code/core/Mage/Core/Model/Config/Base.php b/app/code/core/Mage/Core/Model/Config/Base.php index 8ca3314a45d..8fc4f624c11 100644 --- a/app/code/core/Mage/Core/Model/Config/Base.php +++ b/app/code/core/Mage/Core/Model/Config/Base.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Config/Data.php b/app/code/core/Mage/Core/Model/Config/Data.php index 5924ed19537..81ca618b748 100644 --- a/app/code/core/Mage/Core/Model/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Config/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,16 +29,29 @@ * @method Mage_Core_Model_Resource_Config_Data _getResource() * @method Mage_Core_Model_Resource_Config_Data getResource() * @method Mage_Core_Model_Resource_Config_Data_Collection getCollection() + * @method $this setConfigId(string $value) + * @method $this unsConfigId() + * @method string getField() + * @method $this setField(string $value) + * @method false|SimpleXMLElement|Varien_Simplexml_Element getFieldConfig() + * @method $this setFieldConfig(false|SimpleXMLElement|Varien_Simplexml_Element $value) + * @method $this setFieldsetData(array $value) + * @method int|string getGroupId() + * @method $this setGroupId(int|string $value) + * @method $this setGroups(array $value) + * @method string getPath() + * @method $this setPath(string $value) * @method string getScope() * @method $this setScope(string $value) * @method int getScopeId() * @method $this setScopeId(int $value) - * @method string getPath() - * @method $this setPath(string $value) + * @method string getStoreCode() + * @method $this setStoreCode(string $value) * @method string getValue() * @method $this setValue(string $value) - * @method string getStoreCode() + * @method $this unsValue() * @method string getWebsiteCode() + * @method $this setWebsiteCode(string $value) */ class Mage_Core_Model_Config_Data extends Mage_Core_Model_Abstract { @@ -68,10 +82,12 @@ protected function _construct() /** * Add availability call after load as public + * @return $this */ public function afterLoad() { $this->_afterLoad(); + return $this; } /** diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php index d7d43fa7dea..f199ca122e2 100644 --- a/app/code/core/Mage/Core/Model/Config/Element.php +++ b/app/code/core/Mage/Core/Model/Config/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +50,7 @@ public function is($var, $value = true) } /** - * @return string + * @return false|string */ public function getClassName() { diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php index 90f033d06a9..23a8f989946 100644 --- a/app/code/core/Mage/Core/Model/Config/Options.php +++ b/app/code/core/Mage/Core/Model/Config/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Model_Config_Options extends Varien_Object { @@ -177,8 +178,7 @@ public function getSysTmpDir() public function getVarDir() { //$dir = $this->getDataSetDefault('var_dir', $this->getBaseDir().DS.'var'); - $dir = isset($this->_data['var_dir']) ? $this->_data['var_dir'] - : $this->_data['base_dir'] . DS . self::VAR_DIRECTORY; + $dir = $this->_data['var_dir'] ?? ($this->_data['base_dir'] . DS . self::VAR_DIRECTORY); if (!$this->createDirIfNotExists($dir)) { $dir = $this->getSysTmpDir().DS.'magento'.DS.'var'; if (!$this->createDirIfNotExists($dir)) { diff --git a/app/code/core/Mage/Core/Model/Config/System.php b/app/code/core/Mage/Core/Model/Config/System.php index f49f332682b..2740908d2f0 100644 --- a/app/code/core/Mage/Core/Model/Config/System.php +++ b/app/code/core/Mage/Core/Model/Config/System.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Convert.php b/app/code/core/Mage/Core/Model/Convert.php index e7033d2d50a..743517ac2fe 100644 --- a/app/code/core/Mage/Core/Model/Convert.php +++ b/app/code/core/Mage/Core/Model/Convert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Cookie.php b/app/code/core/Mage/Core/Model/Cookie.php index 1078a0441af..5d960e29e51 100644 --- a/app/code/core/Mage/Core/Model/Cookie.php +++ b/app/code/core/Mage/Core/Model/Cookie.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php index 703ffcdd0a0..f204e1659e1 100644 --- a/app/code/core/Mage/Core/Model/Date.php +++ b/app/code/core/Mage/Core/Model/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,12 +94,12 @@ public function calculateOffset($timezone = null) * * @param string $format * @param int|string $input date in current timezone - * @return string + * @return false|string */ public function gmtDate($format = null, $input = null) { if (is_null($format)) { - $format = 'Y-m-d H:i:s'; + $format = Varien_Date::DATETIME_PHP_FORMAT; } $date = $this->gmtTimestamp($input); @@ -121,7 +122,7 @@ public function gmtDate($format = null, $input = null) public function date($format = null, $input = null) { if (is_null($format)) { - $format = 'Y-m-d H:i:s'; + $format = Varien_Date::DATETIME_PHP_FORMAT; } return date($format, $this->timestamp($input)); @@ -131,7 +132,7 @@ public function date($format = null, $input = null) * Forms GMT timestamp * * @param int|string $input date in current timezone - * @return int + * @return string|false|int */ public function gmtTimestamp($input = null) { diff --git a/app/code/core/Mage/Core/Model/Design.php b/app/code/core/Mage/Core/Model/Design.php index bc44dfff339..231e9b131a3 100644 --- a/app/code/core/Mage/Core/Model/Design.php +++ b/app/code/core/Mage/Core/Model/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Design/Config.php b/app/code/core/Mage/Core/Model/Design/Config.php index 28e8b31d2ad..6e9bb13fb78 100644 --- a/app/code/core/Mage/Core/Model/Design/Config.php +++ b/app/code/core/Mage/Core/Model/Design/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,7 +66,7 @@ public function __construct(array $params = []) /** * Load cache * - * @return boolean + * @return bool */ public function loadCache() { diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php index 8650bee8913..a8102104bbe 100644 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ b/app/code/core/Mage/Core/Model/Design/Fallback.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,12 +53,11 @@ class Mage_Core_Model_Design_Fallback protected $_visited; /** - * Constructor * @param array $params */ public function __construct(array $params = []) { - $this->_config = isset($params['config']) ? $params['config'] : Mage::getModel('core/design_config'); + $this->_config = $params['config'] ?? Mage::getModel('core/design_config'); } /** @@ -67,14 +67,11 @@ public function __construct(array $params = []) */ public function getStore() { - if ($this->_store === null) { - return Mage::app()->getStore(); - } - return $this->_store; + return $this->_store ?? Mage::app()->getStore(); } /** - * @param string|integer|Mage_Core_Model_Store $store + * @param string|int|Mage_Core_Model_Store $store * @return $this */ public function setStore($store) diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php index 43535d6b7db..9dd9e686717 100644 --- a/app/code/core/Mage/Core/Model/Design/Package.php +++ b/app/code/core/Mage/Core/Model/Design/Package.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Core + * @author Magento Core Team + */ class Mage_Core_Model_Design_Package { const DEFAULT_AREA = 'frontend'; @@ -107,7 +113,7 @@ public function __construct() /** * Set store * - * @param string|integer|Mage_Core_Model_Store $store + * @param string|int|Mage_Core_Model_Store $store * @return $this */ public function setStore($store) @@ -126,10 +132,7 @@ public function setStore($store) */ public function getStore() { - if ($this->_store === null) { - return Mage::app()->getStore(); - } - return $this->_store; + return $this->_store ?? Mage::app()->getStore(); } /** @@ -312,7 +315,7 @@ public function updateParamDefaults(array &$params) $params['_package'] = $this->getPackageName(); } if (empty($params['_theme'])) { - $params['_theme'] = $this->getTheme((isset($params['_type'])) ? $params['_type'] : ''); + $params['_theme'] = $this->getTheme($params['_type'] ?? ''); } if (empty($params['_default'])) { $params['_default'] = false; diff --git a/app/code/core/Mage/Core/Model/Design/Source/Apply.php b/app/code/core/Mage/Core/Model/Design/Source/Apply.php index 7a54a3e4b9e..967be2b8ba3 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Apply.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Apply.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Design/Source/Design.php b/app/code/core/Mage/Core/Model/Design/Source/Design.php index 9575cd509d6..af713aa192a 100644 --- a/app/code/core/Mage/Core/Model/Design/Source/Design.php +++ b/app/code/core/Mage/Core/Model/Design/Source/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Core_Model_Design_Source_Design extends Mage_Eav_Model_Entity_Attribu * Setter * Add package name to label * - * @param boolean $isFullLabel + * @param bool $isFullLabel * @return $this */ public function setIsFullLabel($isFullLabel) @@ -43,7 +44,7 @@ public function setIsFullLabel($isFullLabel) /** * Getter * - * @return boolean + * @return bool */ public function getIsFullLabel() { @@ -87,7 +88,7 @@ public function getAllOptions($withEmpty = true) /** * Get a text for option value * - * @param string|integer $value + * @param string|int $value * @return string */ public function getOptionText($value) diff --git a/app/code/core/Mage/Core/Model/Domainpolicy.php b/app/code/core/Mage/Core/Model/Domainpolicy.php index f781f53d39c..1e865ed6706 100644 --- a/app/code/core/Mage/Core/Model/Domainpolicy.php +++ b/app/code/core/Mage/Core/Model/Domainpolicy.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +60,7 @@ class Mage_Core_Model_Domainpolicy */ public function __construct($options = []) { - $this->_store = isset($options['store']) ? $options['store'] : Mage::app()->getStore(); + $this->_store = $options['store'] ?? Mage::app()->getStore(); } /** diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php index 2eccac88598..01525af19ee 100644 --- a/app/code/core/Mage/Core/Model/Email.php +++ b/app/code/core/Mage/Core/Model/Email.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Info.php b/app/code/core/Mage/Core/Model/Email/Info.php index c10b79b87f9..cddd8ed663c 100644 --- a/app/code/core/Mage/Core/Model/Email/Info.php +++ b/app/code/core/Mage/Core/Model/Email/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Email/Queue.php b/app/code/core/Mage/Core/Model/Email/Queue.php index ae3dac35996..8d25ccb36a2 100644 --- a/app/code/core/Mage/Core/Model/Email/Queue.php +++ b/app/code/core/Mage/Core/Model/Email/Queue.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Email Template Mailer Model * - * @category Mage - * @package Mage_Core + * @category Mage + * @package Mage_Core + * @author Magento Core Team * * @method Mage_Core_Model_Resource_Email_Queue _getResource() * @method Mage_Core_Model_Resource_Email_Queue_Collection getCollection() diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index 8411b1134bb..f79e851ec17 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -32,6 +33,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 +77,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 { @@ -267,7 +268,7 @@ public function setId($value) /** * Return true if this template can be used for sending queue as main template * - * @return boolean + * @return bool */ public function isValidForSend() { @@ -377,7 +378,7 @@ public function getInclude($template, array $variables) * @param array|string $email E-mail(s) * @param array|string|null $name receiver name(s) * @param array $variables template variables - * @return boolean + * @return bool **/ public function send($email, $name = null, array $variables = []) { @@ -607,7 +608,7 @@ protected function _parseVariablesString($variablesString) /** * Retrieve option array of variables * - * @param boolean $withGroup if true wrap variable options in group + * @param bool $withGroup if true wrap variable options in group * @return array */ public function getVariablesOptionArray($withGroup = false) diff --git a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php index 064b05d60d2..a7f461ec261 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Abstract.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -146,7 +147,7 @@ protected function _getLogoAlt($store) * * @param array $variables * @param int $storeId - * @return mixed + * @return array */ protected function _addEmailVariables($variables, $storeId) { diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php index 32516a8ab82..2d8282affbc 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -108,7 +109,7 @@ public function setUseSessionInUrl($flag) /** * Setter * - * @param boolean $plainTemplateMode + * @param bool $plainTemplateMode * @return $this */ public function setPlainTemplateMode($plainTemplateMode) @@ -120,7 +121,7 @@ public function setPlainTemplateMode($plainTemplateMode) /** * Getter * - * @return boolean + * @return bool */ public function getPlainTemplateMode() { @@ -130,7 +131,7 @@ public function getPlainTemplateMode() /** * Setter * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -143,7 +144,7 @@ public function setStoreId($storeId) * Getter * if $_storeId is null return Design store id * - * @return integer + * @return int * @throws Mage_Core_Model_Store_Exception */ public function getStoreId() @@ -324,7 +325,7 @@ public function storeDirective($construction) $params['_direct'] = $params['direct_url']; unset($params['direct_url']); } else { - $path = isset($params['url']) ? $params['url'] : ''; + $path = $params['url'] ?? ''; unset($params['url']); } diff --git a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php index a7fb2aee165..2c475a2a65c 100644 --- a/app/code/core/Mage/Core/Model/Email/Template/Mailer.php +++ b/app/code/core/Mage/Core/Model/Email/Template/Mailer.php @@ -7,26 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Email Template Mailer Model * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Email_Template_Mailer setQueue(Mage_Core_Model_Abstract $value) * @method Mage_Core_Model_Email_Queue getQueue() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Email_Template_Mailer extends Varien_Object { diff --git a/app/code/core/Mage/Core/Model/Email/Transport.php b/app/code/core/Mage/Core/Model/Email/Transport.php index e95c9a1d9b7..3f742d2b9ad 100644 --- a/app/code/core/Mage/Core/Model/Email/Transport.php +++ b/app/code/core/Mage/Core/Model/Email/Transport.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Encryption.php b/app/code/core/Mage/Core/Model/Encryption.php index 83e04946bbb..4207f6c515c 100644 --- a/app/code/core/Mage/Core/Model/Encryption.php +++ b/app/code/core/Mage/Core/Model/Encryption.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Factory.php b/app/code/core/Mage/Core/Model/Factory.php index 201d814f337..6c7a6bdd5c1 100644 --- a/app/code/core/Mage/Core/Model/Factory.php +++ b/app/code/core/Mage/Core/Model/Factory.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage.php b/app/code/core/Mage/Core/Model/File/Storage.php index 49ab685124e..da4f63f0603 100644 --- a/app/code/core/Mage/Core/Model/File/Storage.php +++ b/app/code/core/Mage/Core/Model/File/Storage.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -102,7 +103,7 @@ public function getStorageModel($storage = null, $params = []) $model = Mage::getModel('core/file_storage_file'); break; case self::STORAGE_MEDIA_DATABASE: - $connection = (isset($params['connection'])) ? $params['connection'] : null; + $connection = $params['connection'] ?? null; $model = Mage::getModel('core/file_storage_database', ['connection' => $connection]); break; default: @@ -130,7 +131,7 @@ public function synchronize($storage) { if (is_array($storage) && isset($storage['type'])) { $storageDest = (int) $storage['type']; - $connection = (isset($storage['connection'])) ? $storage['connection'] : null; + $connection = $storage['connection'] ?? null; $helper = Mage::helper('core/file_storage'); // if unable to sync to internal storage from itself diff --git a/app/code/core/Mage/Core/Model/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/File/Storage/Abstract.php index b10a76603c3..f1a7a564ed2 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Abstract.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage/Database.php b/app/code/core/Mage/Core/Model/File/Storage/Database.php index b170dc6803e..e1dd0b1ae01 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage/Database/Abstract.php b/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php index 0c4f7e2dfc7..8a7684399c3 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +37,7 @@ abstract class Mage_Core_Model_File_Storage_Database_Abstract extends Mage_Core_ */ public function __construct($params = []) { - $connectionName = (isset($params['connection'])) ? $params['connection'] : null; + $connectionName = $params['connection'] ?? null; if (empty($connectionName)) { $connectionName = $this->getConfigConnectionName(); } diff --git a/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php index fb148ad1acf..0220c1457cf 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage/File.php b/app/code/core/Mage/Core/Model/File/Storage/File.php index fc6eff5282b..61609189864 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/File/Storage/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Storage/Flag.php b/app/code/core/Mage/Core/Model/File/Storage/Flag.php index c921ab00bf5..ebc80413e81 100644 --- a/app/code/core/Mage/Core/Model/File/Storage/Flag.php +++ b/app/code/core/Mage/Core/Model/File/Storage/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php index afeb0acff57..0f97c5c556b 100644 --- a/app/code/core/Mage/Core/Model/File/Uploader.php +++ b/app/code/core/Mage/Core/Model/File/Uploader.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -86,7 +87,7 @@ public function skipDbProcessing($flag = null) * Check protected/allowed extension * * @param string $extension - * @return boolean + * @return bool */ public function checkAllowedExtension($extension) { @@ -112,7 +113,7 @@ public function checkAllowedExtension($extension) */ public function save($destinationFolder, $newFileName = null) { - $fileName = isset($newFileName) ? $newFileName : $this->_file['name']; + $fileName = $newFileName ?? $this->_file['name']; if (strlen($fileName) > $this->_fileNameMaxLength) { throw new Exception( Mage::helper('core')->__("File name is too long. Maximum length is %s.", $this->_fileNameMaxLength) 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..8f69fb74366 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,9 +75,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/Image.php b/app/code/core/Mage/Core/Model/File/Validator/Image.php index b0238e9e4de..83116feb2cb 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/Image.php +++ b/app/code/core/Mage/Core/Model/File/Validator/Image.php @@ -8,14 +8,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +75,8 @@ public function setAllowedImageTypes(array $imageFileExtensions = []) } /** - * Validation callback for checking is file is image + * Validation callback for checking if file is image + * Destroy malicious code in image by reprocessing * * @param string $filePath Path to temporary uploaded file * @return null @@ -85,8 +87,17 @@ public function validate($filePath) list($imageWidth, $imageHeight, $fileType) = getimagesize($filePath); if ($fileType) { if ($this->isImageType($fileType)) { - /** if 'general/reprocess_images/active' false then skip image reprocessing. */ - if (!Mage::getStoreConfigFlag('general/reprocess_images/active')) { + // Config 'general/reprocess_images/active' is deprecated, replacement is the following: + $imageQuality = Mage::getStoreConfig('admin/security/reprocess_image_quality'); + if ($imageQuality != '') { + $imageQuality = (int) $imageQuality; + } else { + // Value not set in backend. For BC, if depcrecated config does not exist, default to 85. + $imageQuality = Mage::getStoreConfig('general/reprocess_images/active') === null + ? 85 + : (Mage::getStoreConfigFlag('general/reprocess_images/active') ? 85 : 0); + } + if ($imageQuality === 0) { return null; } //replace tmp image with re-sampled copy to exclude images with malicious data @@ -116,7 +127,7 @@ public function validate($filePath) imagegif($img, $filePath); break; case IMAGETYPE_JPEG: - imagejpeg($img, $filePath, 100); + imagejpeg($img, $filePath, $imageQuality); break; case IMAGETYPE_PNG: imagepng($img, $filePath); 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 24901929530..e394f9611f9 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php +++ b/app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,9 +44,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..55020cca029 100644 --- a/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php +++ b/app/code/core/Mage/Core/Model/File/Validator/StreamWrapper.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,7 +49,7 @@ public function __construct($allowedStreamWrappers = []) * Validation callback for checking is stream wrapper allowed * * @param string $filePath Path to file - * @return boolean + * @return bool */ public function validate($filePath) { diff --git a/app/code/core/Mage/Core/Model/Flag.php b/app/code/core/Mage/Core/Model/Flag.php index 9ee0abedb06..e5ae1b4b147 100644 --- a/app/code/core/Mage/Core/Model/Flag.php +++ b/app/code/core/Mage/Core/Model/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +68,7 @@ protected function _beforeSave() } $this->setFlagCode($this->_flagCode); - $this->setLastUpdate(date('Y-m-d H:i:s')); + $this->setLastUpdate(date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT)); return parent::_beforeSave(); } diff --git a/app/code/core/Mage/Core/Model/Input/Filter.php b/app/code/core/Mage/Core/Model/Input/Filter.php index 7fe6dc6fb7d..f77ddd1cb80 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter.php +++ b/app/code/core/Mage/Core/Model/Input/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -189,7 +190,7 @@ public function getFilters($name = null) if ($name === null) { return $this->_filters; } else { - return isset($this->_filters[$name]) ? $this->_filters[$name] : null; + return $this->_filters[$name] ?? null; } } @@ -270,7 +271,7 @@ protected function _applyFiltrationWithHelper($value, Mage_Core_Helper_Abstract * Try to create Magento helper for filtration based on $filterData. Return false on failure * * @param array $filterData - * @return bool|Mage_Core_Helper_Abstract + * @return Mage_Core_Helper_Abstract * @throws Exception */ protected function _getFiltrationHelper($filterData) diff --git a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php index b3c08a916fe..bed2d44cbe4 100644 --- a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php +++ b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Language.php b/app/code/core/Mage/Core/Model/Language.php index 83c1d39b54b..ccc4d6825c5 100644 --- a/app/code/core/Mage/Core/Model/Language.php +++ b/app/code/core/Mage/Core/Model/Language.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Language extends Mage_Core_Model_Abstract { protected function _construct() diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php index 595be221ba3..8a3ca3e0db8 100644 --- a/app/code/core/Mage/Core/Model/Layout.php +++ b/app/code/core/Mage/Core/Model/Layout.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Layout extends Varien_Simplexml_Config { @@ -64,7 +66,7 @@ class Mage_Core_Model_Layout extends Varien_Simplexml_Config /** * Flag to have blocks' output go directly to browser as oppose to return result * - * @var boolean + * @var bool */ protected $_directOutput = false; @@ -538,11 +540,7 @@ public function getAllBlocks() */ public function getBlock($name) { - if (isset($this->_blocks[$name])) { - return $this->_blocks[$name]; - } else { - return false; - } + return $this->_blocks[$name] ?? false; } /** diff --git a/app/code/core/Mage/Core/Model/Layout/Data.php b/app/code/core/Mage/Core/Model/Layout/Data.php index 50ce3c6ed5c..e7a63452d2b 100644 --- a/app/code/core/Mage/Core/Model/Layout/Data.php +++ b/app/code/core/Mage/Core/Model/Layout/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Element.php b/app/code/core/Mage/Core/Model/Layout/Element.php index 7cb59f64329..a223f22d8ea 100644 --- a/app/code/core/Mage/Core/Model/Layout/Element.php +++ b/app/code/core/Mage/Core/Model/Layout/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..8bce613318c 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** @@ -414,7 +420,7 @@ public function fetchRecursiveUpdates($updateXml) * @param string $area * @param string $package * @param string $theme - * @param integer|null $storeId + * @param int|null $storeId * @return SimpleXMLElement */ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null) @@ -437,7 +443,7 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null $updateFiles = []; foreach ($updates as $updateNode) { if (!empty($updateNode['file'])) { - $module = isset($updateNode['@']['module']) ? $updateNode['@']['module'] : false; + $module = $updateNode['@']['module'] ?? false; if ($module && Mage::getStoreConfigFlag('advanced/modules_disable_output/' . $module, $storeId)) { continue; } diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php index 5a19d23efdb..6b5b2581a63 100644 --- a/app/code/core/Mage/Core/Model/Layout/Validator.php +++ b/app/code/core/Mage/Core/Model/Layout/Validator.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -77,9 +78,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/Locale.php b/app/code/core/Mage/Core/Model/Locale.php index 6740253e841..a03eeeb3f4d 100644 --- a/app/code/core/Mage/Core/Model/Locale.php +++ b/app/code/core/Mage/Core/Model/Locale.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Locale model * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Locale { @@ -540,8 +543,8 @@ public function date($date = null, $part = null, $locale = null, $useTimezone = * Create Zend_Date object with date converted to store timezone and store Locale * * @param null|string|bool|int|Mage_Core_Model_Store $store Information about store - * @param string|integer|Zend_Date|array|null $date date in UTC - * @param boolean $includeTime flag for including time to date + * @param string|int|Zend_Date|array|null $date date in UTC + * @param bool $includeTime flag for including time to date * @param string|null $format * @return Zend_Date */ @@ -564,8 +567,8 @@ public function storeDate($store = null, $date = null, $includeTime = false, $fo * or in format which was passed as parameter. * * @param mixed $store Information about store - * @param string|integer|Zend_Date|array|null $date date in store's timezone - * @param boolean $includeTime flag for including time to date + * @param string|int|Zend_Date|array|null $date date in store's timezone + * @param bool $includeTime flag for including time to date * @param null|string $format * @return Zend_Date */ @@ -589,7 +592,7 @@ public function storeTimeStamp($store = null) $timezone = Mage::app()->getStore($store)->getConfig(self::XML_PATH_DEFAULT_TIMEZONE); $currentTimezone = @date_default_timezone_get(); @date_default_timezone_set($timezone); - $date = date('Y-m-d H:i:s'); + $date = date(Varien_Date::DATETIME_PHP_FORMAT); @date_default_timezone_set($currentTimezone); return strtotime($date); } @@ -792,7 +795,7 @@ public function getTranslation($value = null, $path = null) * Replace all yy date format to yyyy * * @param string $currentFormat - * @return mixed + * @return string|string[]|null */ protected function _convertYearTwoDigitTo4($currentFormat) { diff --git a/app/code/core/Mage/Core/Model/Locale/Config.php b/app/code/core/Mage/Core/Model/Locale/Config.php index fb997cce1e5..7534928039b 100644 --- a/app/code/core/Mage/Core/Model/Locale/Config.php +++ b/app/code/core/Mage/Core/Model/Locale/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Log/Adapter.php b/app/code/core/Mage/Core/Model/Log/Adapter.php index 6d3a58281ed..18c7701b2ff 100644 --- a/app/code/core/Mage/Core/Model/Log/Adapter.php +++ b/app/code/core/Mage/Core/Model/Log/Adapter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Logger.php b/app/code/core/Mage/Core/Model/Logger.php index 10ba9cad7b9..4965591ddb5 100644 --- a/app/code/core/Mage/Core/Model/Logger.php +++ b/app/code/core/Mage/Core/Model/Logger.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Logger model * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Logger { diff --git a/app/code/core/Mage/Core/Model/Magento/Api.php b/app/code/core/Mage/Core/Model/Magento/Api.php index b930b5638a4..d8cb461bf79 100644 --- a/app/code/core/Mage/Core/Model/Magento/Api.php +++ b/app/code/core/Mage/Core/Model/Magento/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..42892267f73 100644 --- a/app/code/core/Mage/Core/Model/Magento/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Magento/Api/V2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Core/Model/Message.php index 1383639d468..e3271e6f13f 100644 --- a/app/code/core/Mage/Core/Model/Message.php +++ b/app/code/core/Mage/Core/Model/Message.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Core_Model_Message { diff --git a/app/code/core/Mage/Core/Model/Message/Abstract.php b/app/code/core/Mage/Core/Model/Message/Abstract.php index 98b85a24ba9..517140c3b45 100644 --- a/app/code/core/Mage/Core/Model/Message/Abstract.php +++ b/app/code/core/Mage/Core/Model/Message/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Collection.php b/app/code/core/Mage/Core/Model/Message/Collection.php index d669ccbaccc..cac96a93249 100644 --- a/app/code/core/Mage/Core/Model/Message/Collection.php +++ b/app/code/core/Mage/Core/Model/Message/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -135,7 +136,7 @@ public function deleteMessageByIdentifier($identifier) public function getItems($type = null) { if ($type) { - return isset($this->_messages[$type]) ? $this->_messages[$type] : []; + return $this->_messages[$type] ?? []; } $arrRes = []; @@ -154,7 +155,7 @@ public function getItems($type = null) */ public function getItemsByType($type) { - return isset($this->_messages[$type]) ? $this->_messages[$type] : []; + return $this->_messages[$type] ?? []; } /** diff --git a/app/code/core/Mage/Core/Model/Message/Error.php b/app/code/core/Mage/Core/Model/Message/Error.php index c6627b5afcc..ae6f311fa72 100644 --- a/app/code/core/Mage/Core/Model/Message/Error.php +++ b/app/code/core/Mage/Core/Model/Message/Error.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Notice.php b/app/code/core/Mage/Core/Model/Message/Notice.php index e3b8bd56dec..75fa557dd4f 100644 --- a/app/code/core/Mage/Core/Model/Message/Notice.php +++ b/app/code/core/Mage/Core/Model/Message/Notice.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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_Notice extends Mage_Core_Model_Message_Abstract { /** diff --git a/app/code/core/Mage/Core/Model/Message/Success.php b/app/code/core/Mage/Core/Model/Message/Success.php index 7ca6c9bdd1a..e9126607b08 100644 --- a/app/code/core/Mage/Core/Model/Message/Success.php +++ b/app/code/core/Mage/Core/Model/Message/Success.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..d29c3156b37 100644 --- a/app/code/core/Mage/Core/Model/Message/Warning.php +++ b/app/code/core/Mage/Core/Model/Message/Warning.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php index 1b734e72496..ed0e70d583f 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Cache.php b/app/code/core/Mage/Core/Model/Mysql4/Cache.php index 3f9f91a8d51..489dd3ea698 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Cache.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Cache.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php index 2918931fcce..e4eb09a2c7a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config.php b/app/code/core/Mage/Core/Model/Mysql4/Config.php index ac4f892ba9c..baaaa63bb7a 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php index b056054c6a6..9a704569909 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php index 37f44b73d2e..621cff5d336 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design.php b/app/code/core/Mage/Core/Model/Mysql4/Design.php index 17de353f9b8..5e99ee4035e 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php index f6a94a1c7b5..e0dede0629d 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php index 5f8afea336f..68875ec6c35 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php index b494e4075dd..5e62d98acaf 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..013f51e5cec 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php index 61a53aa9662..e000fb220a3 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php index 50093cfd9ea..6438b00a46f 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php index 528020813a9..62e564c6741 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php index 971238920b6..3bfb89443e3 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php index 672b5225658..1b31628c3bc 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Flag.php b/app/code/core/Mage/Core/Model/Mysql4/Flag.php index 5b658338d4c..284e8f619fa 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Flag.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language.php b/app/code/core/Mage/Core/Model/Mysql4/Language.php index 9312909567e..01bcc4362a7 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Language.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Language.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Language extends Mage_Core_Model_Resource_Language diff --git a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php index 1d3832a3e4f..439abec95e6 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Layout.php b/app/code/core/Mage/Core/Model/Mysql4/Layout.php index 82c1097b922..339dc5ad18d 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Layout.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Layout.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Layout extends Mage_Core_Model_Resource_Layout diff --git a/app/code/core/Mage/Core/Model/Mysql4/Resource.php b/app/code/core/Mage/Core/Model/Mysql4/Resource.php index ee90c1b0306..485342631f7 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Resource.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Resource.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Mysql Model for module * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Resource extends Mage_Core_Model_Resource_Resource diff --git a/app/code/core/Mage/Core/Model/Mysql4/Session.php b/app/code/core/Mage/Core/Model/Mysql4/Session.php index d47037389bc..255be85008f 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Session.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..31085cd1ea6 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Store/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php index c9b4c1c9353..03603ef4ae5 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php index d02980fdc42..e4234260a54 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php index 3cd3328e9f1..eaa8f5815ca 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Translate.php b/app/code/core/Mage/Core/Model/Mysql4/Translate.php index 6d53b9914f1..03ab470c1ba 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..4e617d7d39f 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Translate/String.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php index daf5ee0e1f2..0827132a025 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Url rewrite resource model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team * @deprecated */ class Mage_Core_Model_Mysql4_Url_Rewrite extends Mage_Core_Model_Resource_Url_Rewrite diff --git a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php index 6ec49846aaf..72eb7d5fb24 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Variable.php b/app/code/core/Mage/Core/Model/Mysql4/Variable.php index 1834cd5c90b..21a065cbe75 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Variable/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php index 14b40b40ced..d8208c00fc1 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Mysql4/Website.php b/app/code/core/Mage/Core/Model/Mysql4/Website.php index d7e38aa250c..0161777c0e5 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Website/Collection.php b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php index a39d2baef7e..e03545700d8 100644 --- a/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php +++ b/app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Observer.php b/app/code/core/Mage/Core/Model/Observer.php index ea91bb24870..0d45cbfd6a1 100644 --- a/app/code/core/Mage/Core/Model/Observer.php +++ b/app/code/core/Mage/Core/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -67,7 +68,7 @@ public function addSynchronizeNotification(Varien_Event_Observer $observer) $description = Mage::helper('adminhtml')->__('Synchronization of media storages has been successfully completed.'); } - $date = date('Y-m-d H:i:s'); + $date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT); Mage::getModel('adminnotification/inbox')->parse([ [ 'severity' => $severity, diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php index b4ccaa172a0..619ed046e1b 100644 --- a/app/code/core/Mage/Core/Model/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource.php @@ -7,20 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Resources and connections registry and factory * + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource { @@ -321,11 +325,7 @@ public function setMappedTableName($tableName, $mappedName) */ public function getMappedTableName($tableName) { - if (isset($this->_mappedTableNames[$tableName])) { - return $this->_mappedTableNames[$tableName]; - } else { - return false; - } + return $this->_mappedTableNames[$tableName] ?? false; } /** diff --git a/app/code/core/Mage/Core/Model/Resource/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Abstract.php index cc4199e0bba..263b46193aa 100644 --- a/app/code/core/Mage/Core/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,9 +46,6 @@ public function __construct() */ static protected $_commitCallbacks = []; - /** - * Resource initialization - */ abstract protected function _construct(); /** @@ -233,9 +231,8 @@ protected function _prepareDataForTable(Varien_Object $object, $table) */ protected function _prepareTableValueForSave($value, $type) { - $type = strtolower($type); if ($type == 'decimal' || $type == 'numeric' || $type == 'float') { - $value = Mage::app()->getLocale()->getNumber($value); + return Mage::app()->getLocale()->getNumber($value); } return $value; } diff --git a/app/code/core/Mage/Core/Model/Resource/Cache.php b/app/code/core/Mage/Core/Model/Resource/Cache.php index c934529c863..18a79a83365 100644 --- a/app/code/core/Mage/Core/Model/Resource/Cache.php +++ b/app/code/core/Mage/Core/Model/Resource/Cache.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..8f5ef24ad41 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config.php +++ b/app/code/core/Mage/Core/Model/Resource/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..68ed9605a7b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config/Data.php +++ b/app/code/core/Mage/Core/Model/Resource/Config/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php index b2b73a4efa4..c3e83e9408d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php index a00fb8f5bd4..20ee8958347 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +92,7 @@ abstract class Mage_Core_Model_Resource_Db_Abstract extends Mage_Core_Model_Reso /** * Use is object new method for save of object * - * @var boolean + * @var bool */ protected $_useIsObjectNew = false; @@ -186,7 +187,7 @@ protected function _setResource($connections, $tables = null) /** * Set main entity table name and primary key field name - * If field name is ommited {table_name}_id will be used + * If field name is omitted {table_name}_id will be used * * @param string $mainTable * @param string|null $idFieldName @@ -477,8 +478,8 @@ public function save(Mage_Core_Model_Abstract $object) } /** - * Forsed save object data - * forsed update If duplicate unique key data + * Forced save object data + * forced update If duplicate unique key data * * @deprecated * @param Mage_Core_Model_Abstract $object @@ -551,7 +552,7 @@ public function resetUniqueField() } /** - * Unserialize serializeable object fields + * Un-serialize serializable object fields * * @param Mage_Core_Model_Abstract $object */ @@ -603,7 +604,7 @@ protected function _prepareDataForSave(Mage_Core_Model_Abstract $object) * has really changed comparing with origData * * @param Mage_Core_Model_Abstract $object - * @return boolean + * @return bool */ public function hasDataChanged($object) { @@ -756,7 +757,7 @@ protected function _afterDelete(Mage_Core_Model_Abstract $object) } /** - * Serialize serializeable fields of the object + * Serialize serializable fields of the object * * @param Mage_Core_Model_Abstract $object */ diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php index edd8089235e..66d40235f53 100644 --- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -67,7 +68,7 @@ abstract class Mage_Core_Model_Resource_Db_Collection_Abstract extends Varien_Da /** * Fields to select changed flag * - * @var boolean + * @var bool */ protected $_fieldsToSelectChanged = false; @@ -88,7 +89,7 @@ abstract class Mage_Core_Model_Resource_Db_Collection_Abstract extends Varien_Da /** * Reset items data changed flag * - * @var boolean + * @var bool */ protected $_resetItemsDataChanged = false; @@ -214,7 +215,7 @@ protected function _initSelectFields() if ($column instanceof Zend_Db_Expr) { $column = $column->__toString(); } - $key = ($alias !== null ? $alias : $column); + $key = $alias ?? $column; $columnsToSelect[$key] = $columnEntry; } } @@ -357,7 +358,7 @@ public function addExpressionFieldToSelect($alias, $expression, $fields) * Removes field from select * * @param string|null $field - * @param boolean $isAlias Alias identifier + * @param bool $isAlias Alias identifier * @return $this */ public function removeFieldFromSelect($field, $isAlias = false) @@ -589,7 +590,7 @@ protected function _beforeLoad() /** * Set reset items data changed flag * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setResetItemsDataChanged($flag) @@ -701,7 +702,7 @@ protected function _getCacheTags() * Format Date to internal database date format * * @param int|string|Zend_Date $date - * @param boolean $includeTime + * @param bool $includeTime * @return string */ public function formatDate($date, $includeTime = true) diff --git a/app/code/core/Mage/Core/Model/Resource/Design.php b/app/code/core/Mage/Core/Model/Resource/Design.php index 41c3754c745..709d0e45187 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design.php +++ b/app/code/core/Mage/Core/Model/Resource/Design.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Design/Collection.php b/app/code/core/Mage/Core/Model/Resource/Design/Collection.php index 5fe54ad5188..5e484025078 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Design/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php b/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php index e0690546f42..b876f2badbf 100644 --- a/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Queue.php b/app/code/core/Mage/Core/Model/Resource/Email/Queue.php index 95d6e2e89ef..84cd2dd567a 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Queue.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Queue.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Email_Queue extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php b/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php index 4b36a910165..946f017de27 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..d63a49c5176 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -59,7 +56,7 @@ public function loadByCode($templateCode) * Check usage of template code in other templates * * @param Mage_Core_Model_Email_Template $template - * @return boolean + * @return bool */ public function checkCodeUsage(Mage_Core_Model_Email_Template $template) { diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php index d939e6196fa..e0d06cccdd4 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php index ed8c1700fa6..81104577f56 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..e3021a75bb8 100644 --- a/app/code/core/Mage/Core/Model/Resource/Entity/Table.php +++ b/app/code/core/Mage/Core/Model/Resource/Entity/Table.php @@ -7,26 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/File/Storage/Abstract.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php index 3f275a536f7..2a61032bb3f 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php index f5597110fa7..7077c996902 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php index cfe9cb1b106..31d201d335e 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php index c535500264e..a383d22a9e7 100644 --- a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php +++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Flag.php b/app/code/core/Mage/Core/Model/Resource/Flag.php index d6bf99c5c79..b8d22ecf0fd 100644 --- a/app/code/core/Mage/Core/Model/Resource/Flag.php +++ b/app/code/core/Mage/Core/Model/Resource/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Helper/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php index 783243f27d6..1aa13cef7a2 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -103,7 +104,7 @@ protected function _getConnection($name) /** * Escapes value, that participates in LIKE, with '\' symbol. - * Note: this func cannot be used on its own, because different RDMBS may use different default escape symbols, + * Note: this func cannot be used on its own, because different RDBMS may use different default escape symbols, * so you should either use addLikeEscape() to produce LIKE construction, or add escape symbol on your own. * * By default escapes '_', '%' and '\' symbols. If some masking symbols must not be escaped, then you can set diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php index 5ce41585757..1ebae543352 100644 --- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Resource helper class for MySql Varien DB Adapter * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Abstract { diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php index 627566d41aa..bbfc6e88800 100644 --- a/app/code/core/Mage/Core/Model/Resource/Iterator.php +++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Active record implementation * - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Iterator extends Varien_Object { diff --git a/app/code/core/Mage/Core/Model/Resource/Language.php b/app/code/core/Mage/Core/Model/Resource/Language.php index 7d98ed3b79a..f09f264e8c2 100644 --- a/app/code/core/Mage/Core/Model/Resource/Language.php +++ b/app/code/core/Mage/Core/Model/Resource/Language.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Language 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_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/Language/Collection.php b/app/code/core/Mage/Core/Model/Resource/Language/Collection.php index 2d565e4a949..9128bdab204 100644 --- a/app/code/core/Mage/Core/Model/Resource/Language/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Language/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Layout.php b/app/code/core/Mage/Core/Model/Resource/Layout.php index 1e108b6e60d..93fcaf8bdbc 100644 --- a/app/code/core/Mage/Core/Model/Resource/Layout.php +++ b/app/code/core/Mage/Core/Model/Resource/Layout.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Core layout update 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_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 17c83f5c419..8c02925fabd 100644 --- a/app/code/core/Mage/Core/Model/Resource/Resource.php +++ b/app/code/core/Mage/Core/Model/Resource/Resource.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Core Resource 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_Resource extends Mage_Core_Model_Resource_Db_Abstract { @@ -41,10 +42,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'); @@ -98,7 +95,7 @@ public function getDbVersion($resName) return false; } $this->_loadVersionData('db'); - return isset(self::$_versions[$resName]) ? self::$_versions[$resName] : false; + return self::$_versions[$resName] ?? false; } /** @@ -142,7 +139,7 @@ public function getDataVersion($resName) $this->_loadVersionData('data'); - return isset(self::$_dataVersions[$resName]) ? self::$_dataVersions[$resName] : false; + return self::$_dataVersions[$resName] ?? false; } /** diff --git a/app/code/core/Mage/Core/Model/Resource/Session.php b/app/code/core/Mage/Core/Model/Resource/Session.php index 397bd3cf5b5..de89cf3284a 100644 --- a/app/code/core/Mage/Core/Model/Resource/Session.php +++ b/app/code/core/Mage/Core/Model/Resource/Session.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -35,7 +36,7 @@ class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Inter /** * Session lifetime * - * @var integer + * @var int */ protected $_lifeTime; @@ -69,10 +70,6 @@ class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Inter */ protected $_automaticCleaningFactor = 50; - /** - * Constructor - * - */ public function __construct() { $resource = Mage::getSingleton('core/resource'); @@ -170,7 +167,7 @@ public static function setStaticSaveHandler() * * @param string $savePath ignored * @param string $sessName ignored - * @return boolean + * @return bool */ public function open($savePath, $sessName) { @@ -180,7 +177,7 @@ public function open($savePath, $sessName) /** * Close session * - * @return boolean + * @return bool */ public function close() { @@ -216,7 +213,7 @@ public function read($sessId) * * @param string $sessId * @param string $sessData - * @return boolean + * @return bool */ public function write($sessId, $sessData) { @@ -249,7 +246,7 @@ public function write($sessId, $sessData) * Destroy session * * @param string $sessId - * @return boolean + * @return bool */ public function destroy($sessId) { @@ -262,7 +259,7 @@ public function destroy($sessId) * Garbage collection * * @param int $sessMaxLifeTime ignored - * @return boolean + * @return bool */ public function gc($sessMaxLifeTime) { diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php index b207d10a125..b2d77371cb5 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -69,7 +70,7 @@ class Mage_Core_Model_Resource_Setup /** * Call afterApplyAllUpdates method flag * - * @var boolean + * @var bool */ protected $_callAfterApplyAllUpdates = false; @@ -207,7 +208,7 @@ protected function _getResource() /** * Apply database updates whenever needed * - * @return boolean + * @return bool */ public static function applyAllUpdates() { @@ -705,10 +706,10 @@ protected function _getModifySqlFiles($actionType, $fromVersion, $toVersion, $ar * * @param string $table * @param string $idField - * @param string|integer $id + * @param string|int $id * @param string $field * @param string $parentField - * @param string|integer $parentId + * @param string|int $parentId * @return mixed|boolean */ public function getTableRow($table, $idField, $id, $field = null, $parentField = null, $parentId = 0) @@ -733,9 +734,7 @@ public function getTableRow($table, $idField, $id, $field = null, $parentField = if (is_null($field)) { return $this->_setupCache[$table][$parentId][$id]; } - return isset($this->_setupCache[$table][$parentId][$id][$field]) - ? $this->_setupCache[$table][$parentId][$id][$field] - : false; + return $this->_setupCache[$table][$parentId][$id][$field] ?? false; } /** @@ -774,11 +773,11 @@ public function deleteTableRow($table, $idField, $id, $parentField = null, $pare * * @param string $table * @param string $idField - * @param string|integer $id + * @param string|int $id * @param string|array $field * @param mixed|null $value * @param string $parentField - * @param string|integer $parentId + * @param string|int $parentId * @return $this */ public function updateTableRow($table, $idField, $id, $field, $value = null, $parentField = null, $parentId = 0) @@ -976,7 +975,7 @@ public function getFkName($priTableName, $priColumnName, $refTableName, $refColu /** * Check call afterApplyAllUpdates method for setup class * - * @return boolean + * @return bool */ public function getCallAfterApplyAllUpdates() { diff --git a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php index 7a9f7b0902b..2a828a0d642 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Modifier of queries, developed for backwards compatibility on MySQL, * while creating foreign keys * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Setup_Query_Modifier { diff --git a/app/code/core/Mage/Core/Model/Resource/Store.php b/app/code/core/Mage/Core/Model/Resource/Store.php index 769192be190..5513b42b8d3 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store.php +++ b/app/code/core/Mage/Core/Model/Resource/Store.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Core/Model/Resource/Store/Collection.php index 9698486ec57..e4dc37931b8 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Core_Model_Resource_Store_Collection extends Mage_Core_Model_Resource * Load default flag * * @deprecated since 1.5.0.0 - * @var boolean + * @var bool */ protected $_loadDefault = false; @@ -48,7 +49,7 @@ protected function _construct() /** * Set flag for load default (admin) store * - * @param boolean $loadDefault + * @param bool $loadDefault * @return $this */ public function setLoadDefault($loadDefault) @@ -60,7 +61,7 @@ public function setLoadDefault($loadDefault) /** * Is load default (admin) store * - * @return boolean + * @return bool */ public function getLoadDefault() { 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..2208ce708d7 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Store/Group/Collection.php b/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php index 33c690659e7..076e70526ba 100644 --- a/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Core_Model_Resource_Store_Group_Collection extends Mage_Core_Model_Re * Load default flag * * @deprecated since 1.5.0.0 - * @var boolean + * @var bool */ protected $_loadDefault = false; @@ -48,7 +49,7 @@ protected function _construct() /** * Set flag for load default (admin) store * - * @param boolean $loadDefault + * @param bool $loadDefault * * @return $this */ @@ -60,7 +61,7 @@ public function setLoadDefault($loadDefault) /** * Is load default (admin) store * - * @return boolean + * @return bool */ public function getLoadDefault() { diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php index 01fad7fed86..e5797674c4a 100644 --- a/app/code/core/Mage/Core/Model/Resource/Transaction.php +++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..feb1f0d10a8 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..54f1c84eac5 100644 --- a/app/code/core/Mage/Core/Model/Resource/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Resource/Translate/String.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php index 41b77a9ae28..cdcc91cc15b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db.php b/app/code/core/Mage/Core/Model/Resource/Type/Db.php index 03b93400a4b..24e00af662e 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php index cd042a3eb51..a05b379c178 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Core - * @module Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Type_Db_Mysqli extends Mage_Core_Model_Resource_Type_Db { 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..34fad029041 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Type/Db/Pdo/Mysql.php b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php index 067e000c2d6..fdcee04b83d 100644 --- a/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php +++ b/app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php @@ -7,23 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Pdo_Mysql extends Mage_Core_Model_Resource_Type_Db { - /** - * Get connection - * * @param array $config Connection config * @return Varien_Db_Adapter_Pdo_Mysql */ 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 c5d51688036..0a9fcccbb69 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Url rewrite resource model class * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Resource_Url_Rewrite extends Mage_Core_Model_Resource_Db_Abstract { @@ -34,10 +35,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/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php index 19744dbd70f..d98340b930f 100644 --- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Resource/Variable.php b/app/code/core/Mage/Core/Model/Resource/Variable.php index 9d991236d55..714b99ff7d2 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -55,8 +52,8 @@ public function loadByCode(Mage_Core_Model_Variable $object, $code) * Retrieve variable data by code * * @param string $code - * @param boolean $withValue - * @param integer $storeId + * @param bool $withValue + * @param int $storeId * @return array */ public function getVariableByCode($code, $withValue = false, $storeId = 0) @@ -120,7 +117,7 @@ protected function _getLoadSelect($field, $value, $object) * Add variable store and default value to select * * @param Zend_Db_Select $select - * @param integer $storeId + * @param int $storeId * @return $this */ protected function _addValueToSelect(Zend_Db_Select $select, $storeId = Mage_Core_Model_App::ADMIN_STORE_ID) diff --git a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php index 7bd895dddc0..d9544922182 100644 --- a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +48,7 @@ protected function _construct() /** * Setter * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -59,7 +60,7 @@ public function setStoreId($storeId) /** * Getter * - * @return integer + * @return int */ public function getStoreId() { diff --git a/app/code/core/Mage/Core/Model/Resource/Website.php b/app/code/core/Mage/Core/Model/Resource/Website.php index 7bc186442d7..1d866321214 100644 --- a/app/code/core/Mage/Core/Model/Resource/Website.php +++ b/app/code/core/Mage/Core/Model/Resource/Website.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -101,7 +98,7 @@ protected function _afterDelete(Mage_Core_Model_Abstract $model) * Retrieve default stores select object * Select fields website_id, store_id * - * @param boolean $withDefault include/exclude default admin website + * @param bool $withDefault include/exclude default admin website * @return Varien_Db_Select */ public function getDefaultStoresSelect($withDefault = false) diff --git a/app/code/core/Mage/Core/Model/Resource/Website/Collection.php b/app/code/core/Mage/Core/Model/Resource/Website/Collection.php index 6c79e96f23a..bf18e7314e7 100644 --- a/app/code/core/Mage/Core/Model/Resource/Website/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Website/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +53,7 @@ protected function _construct() /** * Set flag for load default (admin) website * - * @param boolean $loadDefault + * @param bool $loadDefault * @return $this */ public function setLoadDefault($loadDefault) @@ -64,7 +65,7 @@ public function setLoadDefault($loadDefault) /** * Is load default (admin) website * - * @return boolean + * @return bool */ public function getLoadDefault() { diff --git a/app/code/core/Mage/Core/Model/Session.php b/app/code/core/Mage/Core/Model/Session.php index aeec2e7a425..3c4b79fb2b4 100644 --- a/app/code/core/Mage/Core/Model/Session.php +++ b/app/code/core/Mage/Core/Model/Session.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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) @@ -43,7 +46,7 @@ class Mage_Core_Model_Session extends Mage_Core_Model_Session_Abstract */ public function __construct($data = []) { - $name = isset($data['name']) ? $data['name'] : null; + $name = $data['name'] ?? null; $this->init('core', $name); } diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php index 28f85e1b1d3..10343eb187e 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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 f1333acf3c0..e8bf9721f79 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php @@ -7,20 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..87e25c40beb 100644 --- a/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +++ b/app/code/core/Mage/Core/Model/Session/Abstract/Zend.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Session/Exception.php b/app/code/core/Mage/Core/Model/Session/Exception.php index 21da808a843..b61476dec0c 100644 --- a/app/code/core/Mage/Core/Model/Session/Exception.php +++ b/app/code/core/Mage/Core/Model/Session/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..f106af3f566 100644 --- a/app/code/core/Mage/Core/Model/Source/Email/Variables.php +++ b/app/code/core/Mage/Core/Model/Source/Email/Variables.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -34,10 +35,6 @@ class Mage_Core_Model_Source_Email_Variables */ protected $_configVariables = []; - /** - * Constructor - * - */ public function __construct() { $this->_configVariables = [ @@ -99,7 +96,7 @@ public function __construct() /** * Retrieve option array of store contact variables * - * @param boolean $withGroup + * @param bool $withGroup * @return array */ public function toOptionArray($withGroup = false) diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 5f30c3413ea..7b8edf8f12f 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +48,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 { @@ -174,7 +175,7 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract /** * Cache flag * - * @var boolean + * @var bool */ protected $_cacheTag = true; @@ -186,8 +187,6 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract protected $_eventPrefix = 'store'; /** - * Event object name - * * @var string */ protected $_eventObject = 'store'; @@ -258,14 +257,14 @@ class Mage_Core_Model_Store extends Mage_Core_Model_Abstract /** * Flag that shows that backend URLs are secure * - * @var boolean|null + * @var bool|null */ protected $_isAdminSecure = null; /** * Flag that shows that frontend URLs are secure * - * @var boolean|null + * @var bool|null */ protected $_isFrontSecure = null; @@ -608,7 +607,7 @@ public function getUrl($route = '', $params = []) * Retrieve base URL * * @param string $type - * @param boolean|null $secure + * @param bool|null $secure * @return string */ public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null) @@ -690,7 +689,7 @@ protected function _isCustomEntryPoint() * If we use Database file storage and server doesn't support rewrites (.htaccess in media folder) * we have to put name of fetching media script exactly into URL * - * @param null|boolean $secure + * @param null|bool $secure * @param string $type * @return string */ @@ -755,12 +754,12 @@ public function isAdmin() /** * Check if backend URLs should be secure * - * @return boolean + * @return bool */ public function isAdminUrlSecure() { if ($this->_isAdminSecure === null) { - $this->_isAdminSecure = (boolean) (int) (string) Mage::getConfig() + $this->_isAdminSecure = (bool) (int) (string) Mage::getConfig() ->getNode(Mage_Core_Model_Url::XML_PATH_SECURE_IN_ADMIN); } return $this->_isAdminSecure; @@ -769,7 +768,7 @@ public function isAdminUrlSecure() /** * Check if frontend URLs should be secure * - * @return boolean + * @return bool */ public function isFrontUrlSecure() { @@ -785,7 +784,7 @@ public function isFrontUrlSecure() /** * Check if request was secure * - * @return boolean + * @return bool */ public function isCurrentlySecure() { @@ -878,7 +877,7 @@ public function getDefaultCurrency() * Set current store currency code * * @param string $code - * @return string + * @return $this */ public function setCurrentCurrencyCode($code) { @@ -994,8 +993,8 @@ public function getCurrentCurrencyRate() * Convert price from default currency to current currency * * @param double $price - * @param boolean $format Format price to currency format - * @param boolean $includeContainer Enclose into + * @param bool $format Format price to currency format + * @param bool $includeContainer Enclose into * @return double */ public function convertPrice($price, $format = false, $includeContainer = true) @@ -1130,7 +1129,7 @@ public function getDefaultGroupId() /** * Check if store can be deleted * - * @return boolean + * @return bool */ public function isCanDelete() { @@ -1191,7 +1190,7 @@ public function getCurrentUrl($fromStore = true) /** * Check if store is active * - * @return boolean|null + * @return bool|null */ public function getIsActive() { diff --git a/app/code/core/Mage/Core/Model/Store/Api.php b/app/code/core/Mage/Core/Model/Store/Api.php index f139e6fdbe3..321a5e1ac10 100644 --- a/app/code/core/Mage/Core/Model/Store/Api.php +++ b/app/code/core/Mage/Core/Model/Store/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..5af91e201b7 100644 --- a/app/code/core/Mage/Core/Model/Store/Api/V2.php +++ b/app/code/core/Mage/Core/Model/Store/Api/V2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Core/Model/Store/Exception.php b/app/code/core/Mage/Core/Model/Store/Exception.php index 3f203f5a846..05e8faeffd1 100644 --- a/app/code/core/Mage/Core/Model/Store/Exception.php +++ b/app/code/core/Mage/Core/Model/Store/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Group.php b/app/code/core/Mage/Core/Model/Store/Group.php index 1e99ee56fbf..c4cea75706c 100644 --- a/app/code/core/Mage/Core/Model/Store/Group.php +++ b/app/code/core/Mage/Core/Model/Store/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Store/Observer.php b/app/code/core/Mage/Core/Model/Store/Observer.php index 5fe343f7a41..528fb4a67a6 100644 --- a/app/code/core/Mage/Core/Model/Store/Observer.php +++ b/app/code/core/Mage/Core/Model/Store/Observer.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Store observer * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Store_Observer { - /** - * Cleans cache by store tag - */ public function cleanCache() { Mage::app()->cleanCache([Mage_Core_Model_Store::CACHE_TAG]); diff --git a/app/code/core/Mage/Core/Model/Template.php b/app/code/core/Mage/Core/Model/Template.php index 2511abb25d1..c00355b2596 100644 --- a/app/code/core/Mage/Core/Model/Template.php +++ b/app/code/core/Mage/Core/Model/Template.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -159,7 +160,7 @@ public function revertDesign() /** * Return true if template type eq text * - * @return boolean + * @return bool */ public function isPlain() { diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index 1d5ad2619a8..49d65663841 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -87,14 +90,14 @@ class Mage_Core_Model_Translate /** * Configuration flag to enable inline translations * - * @var boolean + * @var bool */ protected $_translateInline; /** * Configuration flag to local enable inline translations * - * @var boolean + * @var bool */ protected $_canUseInline = true; @@ -193,10 +196,7 @@ public function setConfig($config) */ public function getConfig($key) { - if (isset($this->_config[$key])) { - return $this->_config[$key]; - } - return null; + return $this->_config[$key] ?? null; } /** diff --git a/app/code/core/Mage/Core/Model/Translate/Expr.php b/app/code/core/Mage/Core/Model/Translate/Expr.php index f87e87594d2..3531a554ce3 100644 --- a/app/code/core/Mage/Core/Model/Translate/Expr.php +++ b/app/code/core/Mage/Core/Model/Translate/Expr.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index e34609ef15e..9f7001fd0b8 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -310,11 +311,7 @@ protected function _getTagLocation($matches, $options) { $tagName = strtolower($options['tagName']); - if (isset($options['tagList'][$tagName])) { - return $options['tagList'][$tagName]; - } - - return ucfirst($tagName) . ' Text'; + return $options['tagList'][$tagName] ?? (ucfirst($tagName) . ' Text'); } /** diff --git a/app/code/core/Mage/Core/Model/Translate/String.php b/app/code/core/Mage/Core/Model/Translate/String.php index e77585ddf7d..70ede482dc3 100644 --- a/app/code/core/Mage/Core/Model/Translate/String.php +++ b/app/code/core/Mage/Core/Model/Translate/String.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @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 +36,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..299c0aff234 100644 --- a/app/code/core/Mage/Core/Model/Url.php +++ b/app/code/core/Mage/Core/Model/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -68,7 +69,7 @@ * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @author Magento Core Team * * @method $this setType(string $value) * @method $this setSecure(bool $value) @@ -202,7 +203,7 @@ public function getDefaultControllerName() /** * Set use_url_cache flag * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setUseUrlCache($flag) @@ -621,7 +622,7 @@ public function getActionName() * Set route params * * @param array $data - * @param boolean $unsetOldParams + * @param bool $unsetOldParams * @return $this */ public function setRouteParams(array $data, $unsetOldParams = true) @@ -1193,7 +1194,7 @@ public function sessionVarCallback($match) return $match[1] . $session->getSessionIdQueryParam() . '=' . $session->getEncryptedSessionId() - . (isset($match[3]) ? $match[3] : ''); + . ($match[3] ?? ''); } else { if ($match[1] == '?' && isset($match[3])) { return '?'; @@ -1211,7 +1212,7 @@ public function sessionVarCallback($match) /** * Check if users originated URL is one of the domain URLs assigned to stores * - * @return boolean + * @return bool */ public function isOwnOriginUrl() { diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php index e062e330a81..f58d2bd31b7 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Url rewrite model class * + * @category Mage + * @package Mage_Core + * @author Magento Core Team + * * @method Mage_Core_Model_Resource_Url_Rewrite _getResource() * @method Mage_Core_Model_Resource_Url_Rewrite getResource() * @method Mage_Core_Model_Resource_Url_Rewrite_Collection getResourceCollection() @@ -45,10 +50,6 @@ * @method string|array getTags() * @method $this setTags(string|array $value) * @method bool hasCategoryId() - * - * @category Mage - * @package Mage_Core - * @author Magento Core Team */ class Mage_Core_Model_Url_Rewrite extends Mage_Core_Model_Abstract implements Mage_Core_Model_Url_Rewrite_Interface { @@ -207,8 +208,8 @@ public function removeTag($tags) /** * Implement logic of custom rewrites * - * @param Zend_Controller_Request_Http $request - * @param Zend_Controller_Response_Http $response + * @param Zend_Controller_Request_Http|null $request + * @param Zend_Controller_Response_Http|null $response * @return bool * @throws Mage_Core_Model_Store_Exception * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php index ab6796dce05..1484a6971a1 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Interface.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Url rewrite interface * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ interface Mage_Core_Model_Url_Rewrite_Interface { diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php index e9fdcb27705..529941dde55 100644 --- a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php +++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Url rewrite request model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Url_Rewrite_Request { @@ -356,10 +357,7 @@ protected function _processRewriteUrl($url) */ protected function _getRouter($name) { - if (isset($this->_routers[$name])) { - return $this->_routers[$name]; - } - return false; + return $this->_routers[$name] ?? false; } /** diff --git a/app/code/core/Mage/Core/Model/Url/Validator.php b/app/code/core/Mage/Core/Model/Url/Validator.php index 0b07e6b5e10..3714c8598c2 100644 --- a/app/code/core/Mage/Core/Model/Url/Validator.php +++ b/app/code/core/Mage/Core/Model/Url/Validator.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..fcf0174f68c 100644 --- a/app/code/core/Mage/Core/Model/Variable.php +++ b/app/code/core/Mage/Core/Model/Variable.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +35,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 { @@ -54,7 +55,7 @@ protected function _construct() /** * Setter * - * @param integer $storeId + * @param int $storeId * @return $this */ public function setStoreId($storeId) @@ -66,7 +67,7 @@ public function setStoreId($storeId) /** * Getter * - * @return integer + * @return int */ public function getStoreId() { @@ -110,7 +111,7 @@ public function getValue($type = null) /** * Validation of object data. Checking for unique variable code * - * @return boolean | string + * @return bool | string */ public function validate() { @@ -127,7 +128,7 @@ public function validate() /** * Retrieve variables option array * - * @param boolean $withGroup + * @param bool $withGroup * @return array */ public function getVariablesOptionArray($withGroup = false) diff --git a/app/code/core/Mage/Core/Model/Variable/Config.php b/app/code/core/Mage/Core/Model/Variable/Config.php index 2f339031314..5a7487d6fbc 100644 --- a/app/code/core/Mage/Core/Model/Variable/Config.php +++ b/app/code/core/Mage/Core/Model/Variable/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Observer.php b/app/code/core/Mage/Core/Model/Variable/Observer.php index af25b5fa5e2..43597990353 100644 --- a/app/code/core/Mage/Core/Model/Variable/Observer.php +++ b/app/code/core/Mage/Core/Model/Variable/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Variable observer * - * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @category Mage + * @package Mage_Core + * @author Magento Core Team */ class Mage_Core_Model_Variable_Observer { diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php index b2fd1fa91b4..23720959bd8 100644 --- a/app/code/core/Mage/Core/Model/Website.php +++ b/app/code/core/Mage/Core/Model/Website.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +46,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/controllers/AjaxController.php b/app/code/core/Mage/Core/controllers/AjaxController.php index 83318f7165a..0d456c26782 100644 --- a/app/code/core/Mage/Core/controllers/AjaxController.php +++ b/app/code/core/Mage/Core/controllers/AjaxController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/controllers/IndexController.php b/app/code/core/Mage/Core/controllers/IndexController.php index a454784589b..d217f26501d 100644 --- a/app/code/core/Mage/Core/controllers/IndexController.php +++ b/app/code/core/Mage/Core/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/etc/api.xml b/app/code/core/Mage/Core/etc/api.xml index 8dfc9fda648..8a82fabc4c6 100644 --- a/app/code/core/Mage/Core/etc/api.xml +++ b/app/code/core/Mage/Core/etc/api.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. (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/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 334222e7834..2dd1b2d457c 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> @@ -495,10 +496,6 @@ - - - 1 - diff --git a/app/code/core/Mage/Core/etc/jstranslator.xml b/app/code/core/Mage/Core/etc/jstranslator.xml index 2fe1ad34e00..8fcb6c528a6 100644 --- a/app/code/core/Mage/Core/etc/jstranslator.xml +++ b/app/code/core/Mage/Core/etc/jstranslator.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. (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/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 1f6e61f5e28..44b6daa5653 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> @@ -45,7 +46,7 @@ 1 - + select adminhtml/system_config_source_yesno 10 @@ -1280,6 +1281,15 @@ 0 0 + + + The recommended value is 85, a higher value will increase the file size. You can set the value to 0 to disable image processing, but it may cause security risks. + validate-digits validate-digits-range digits-range-0-100 + 180 + 1 + 1 + 1 + diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php index 4c41da7ebb6..8e65fb6c734 100644 --- a/app/code/core/Mage/Core/functions.php +++ b/app/code/core/Mage/Core/functions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,7 +77,7 @@ function now($dayOnly = false) * Check whether sql date is empty * * @param string $date - * @return boolean + * @return bool */ function is_empty_date($date) { @@ -104,11 +105,11 @@ function mageFindClassFile($class) /** * Custom error handler * - * @param integer $errno + * @param int $errno * @param string $errstr * @param string $errfile - * @param integer $errline - * @return bool + * @param int $errline + * @return bool|void */ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline) { @@ -121,15 +122,6 @@ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline) if ($errno == 0) { return false; } - if (!defined('E_STRICT')) { - define('E_STRICT', 2048); - } - if (!defined('E_RECOVERABLE_ERROR')) { - define('E_RECOVERABLE_ERROR', 4096); - } - if (!defined('E_DEPRECATED')) { - define('E_DEPRECATED', 8192); - } // Suppress deprecation warnings on PHP 7.x if ($errno == E_DEPRECATED && version_compare(PHP_VERSION, '7.0.0', '>=')) { @@ -210,7 +202,7 @@ function mageCoreErrorHandler($errno, $errstr, $errfile, $errline) * @param bool $return * @param bool $html * @param bool $showFirst - * @return string + * @return string|void */ function mageDebugBacktrace($return = false, $html = true, $showFirst = false) { @@ -373,7 +365,7 @@ function sys_get_temp_dir() * * @param string $known_string * @param string $user_string - * @return boolean Returns true when the two strings are equal, false otherwise. + * @return bool Returns true when the two strings are equal, false otherwise. */ function hash_equals($known_string, $user_string) { @@ -446,15 +438,3 @@ function str_ends_with($haystack, $needle) } } -/** - * polyfill for PHP 7.3 function "is_countable" - */ -if (!function_exists('is_countable')) { - /** - * @param mixed $value - * @return bool - */ - function is_countable($value) { - return is_array($value) || $value instanceof Countable || $value instanceof ResourceBundle || $value instanceof SimpleXMLElement; - } -} diff --git a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php index bcfd1c6a7ec..775d77f12c3 100644 --- a/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php index 9cd27390bd2..f4828550c65 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-data-upgrade-1.6.0.2-1.6.0.3.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Core/sql/core_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php index 110e77f3395..c89a138d574 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php index 71f494fd8b6..3452e7046a2 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php index 1fc0c66af48..06cd30e579c 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php index 0a2b29d853b..f525c649fac 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php index 1dd27cf6147..4f787f38c96 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php index d02a4a22ad0..6c6406ed180 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); -$rows = $installer->_conn->fetchAll( +$rows = $installer->getConnection()->fetchAll( "select * from {$this->getTable('core_config_data')} where path in ( 'paypal/wpp/api_password', 'paypal/wpp/api_signature', 'paypal/wpp/api_username', @@ -38,7 +38,7 @@ foreach ($rows as $r) { if (!empty($r['value'])) { $r['value'] = $hlp->encrypt($r['value']); - $installer->_conn->update($this->getTable('core_config_data'), $r, 'config_id='.$r['config_id']); + $installer->getConnection()->update($this->getTable('core_config_data'), $r, 'config_id='.$r['config_id']); } } $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php index 78e00ad462c..446747233cc 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php index 632fe4827b5..47e62b1e17c 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php index cc72967e986..1b68cd615ca 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php index 72e7f03d66d..1b0c349cfa5 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $table = $this->getTable('core_translate'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php index e8b9434a099..f6ea5e6a824 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $configValuesMap = [ 'catalog/productalert/email_stock_template' => 'catalog_productalert_email_stock_template', diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php index 7dfa5ec0bf7..525e04d04c3 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($this->getTable('core/url_rewrite'), 'entity_id', 'INT( 10 ) NOT NULL AFTER `store_id`'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php index 4de440dead6..d3e9cc1364d 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run("CREATE INDEX entity_id ON {$this->getTable('core/url_rewrite')} (entity_id);"); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php index 40555af9d83..c76c3a4a4be 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->dropForeignKey($installer->getTable('design_change'), 'FK_DESIGN_CHANGE_STORE'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php index 4e97b210458..80bf2a95fcd 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php index 4612909e80e..bf4993a6a0b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addConstraint( 'FK_CORE_URL_REWRITE_STORE', $installer->getTable('core/url_rewrite'), @@ -32,4 +33,5 @@ 'CASCADE', true ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php index 55b25ad811e..2d19c4b4501 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('core/layout_update'), 'sort_order', "smallint(5) NOT NULL DEFAULT '0'"); $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php index a6b7894aef9..bc7366398f1 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('core/email_template'), 'orig_template_code', "VARCHAR(200) DEFAULT NULL"); $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php index 57423c780fc..438a3d5a4ac 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php @@ -7,23 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn( $installer->getTable('core_email_template'), 'template_styles', "text AFTER `template_text`" ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php index 95ff564f74d..c640add390e 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" CREATE TABLE IF NOT EXISTS `{$installer->getTable('core_email_variable')}` ( `variable_id` int(11) unsigned NOT NULL AUTO_INCREMENT, @@ -45,4 +46,5 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 "); $installer->getConnection()->addColumn($installer->getTable('core/email_template'), 'orig_template_variables', "text NOT NULL"); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php index 696649e453c..27698aee5d1 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn( $installer->getTable('core_email_variable'), 'is_html', @@ -33,4 +34,5 @@ 'value', 'TEXT NOT NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php index b82bf9ea92c..1ba7d1af86b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.18-0.8.19.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" ALTER TABLE `{$installer->getTable('core_email_variable')}` RENAME TO `{$installer->getTable('core/variable')}`; ALTER TABLE `{$installer->getTable('core_email_variable_value')}` RENAME TO `{$installer->getTable('core/variable_value')}`; diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php index cdddeb06140..2aafa9086a3 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.19-0.8.20.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn($installer->getTable('core/variable_value'), 'plain_value', 'TEXT NOT NULL'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php index d553519a51b..e5c80de5364 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run("UPDATE {$this->getTable('core/url_rewrite')} SET type = IF(id_path LIKE 'category/%', 1, IF(id_path LIKE 'product/%', 2, 3));"); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php index 61bef843d92..66abea850eb 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.20-0.8.21.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->getConnection()->addColumn($installer->getTable('core/resource'), 'data_version', 'varchar(50)'); /* diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php index b97085e3aef..b4dda924bfe 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.21-0.8.22.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" CREATE TABLE IF NOT EXISTS `{$installer->getTable('core/cache')}` ( `id` VARCHAR(255) NOT NULL, diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php index d843aef54d2..48c931faa2f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.22-0.8.23.php @@ -7,22 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn( $installer->getTable('core/layout_link'), 'area', diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php index 34ebc85bddd..9ffe718331b 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.23-0.8.24.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" ALTER TABLE `{$installer->getTable('core/url_rewrite')}` DROP INDEX `UNQ_PATH`, @@ -31,4 +32,5 @@ ADD UNIQUE `UNQ_REQUEST_PATH` (`request_path`, `store_id`), ADD INDEX `IDX_TARGET_PATH` (`target_path`, `store_id`); "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php index 74bd66c8b16..3cb7e928680 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.24-0.8.25.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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()->modifyColumn( diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php index 16d59adecac..4029fbc96af 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.25-0.8.26.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $currentVersion = Mage::getVersion(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php index de3ea6d33ea..f0e8736061d 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.26-0.8.27.php @@ -7,17 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->getConnection()->dropForeignKey($installer->getTable('core/cache_tag'), 'FK_CORE_CACHE_TAG'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php index 44b8707e94b..f631d850328 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.27-0.8.28.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php index 29641bb4b0d..2f450859d13 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Core Install - * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ +/** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE `{$installer->getTable('core_url_rewrite')}` DROP `entity_id`, @@ -44,4 +38,5 @@ ADD INDEX `IDX_TARGET_PATH` (`store_id`, `target_path`); DROP TABLE IF EXISTS `{$installer->getTable('core_url_rewrite_tag')}`; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php index 6a745b04f64..97dc48dabc4 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $conn = $installer->getConnection(); $table = $this->getTable('design_change'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php index 905e4d7e59f..9908aec8e17 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -7,27 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Add default website - * * @category Mage * @package Mage_Core - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ +/** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('core_website'), 'is_default', 'tinyint(1) unsigned default 0'); diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php index e2e07bb1cee..53c431218c1 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php index 47eaea3f56e..2c7cca79b50 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php index 543b6c3aeb4..c748d9922bc 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php index f81f4015b24..845c3db370f 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 9d2f1a8edf8..2e4b04955db 100644 --- a/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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(); $usedDatabaseStorage = $installer->getConnection()->isTableExists( 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..6fbb8337f81 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 @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..764f6ae1c97 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c676f466708 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..8428514726f 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 @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..270531da728 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 @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..523e4655fc5 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 @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..9c9d35e0242 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 @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c0251d5701d 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 @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Core + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Exception.php b/app/code/core/Mage/Cron/Exception.php index 3d1760358aa..311ff5519f1 100644 --- a/app/code/core/Mage/Cron/Exception.php +++ b/app/code/core/Mage/Cron/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Helper/Data.php b/app/code/core/Mage/Cron/Helper/Data.php index 81ca0adc3ad..1cefa9d7eab 100644 --- a/app/code/core/Mage/Cron/Helper/Data.php +++ b/app/code/core/Mage/Cron/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +25,5 @@ */ class Mage_Cron_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Cron'; } diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php index b073e818dfc..0c76a2ab147 100644 --- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Schedule mysql4 resource * - * @category Mage - * @package Mage_Cron - * @author Magento Core Team + * @category Mage + * @package Mage_Cron + * @author Magento Core Team * @deprecated */ class Mage_Cron_Model_Mysql4_Schedule extends Mage_Cron_Model_Resource_Schedule diff --git a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php index 865ac643895..8fe6add70c1 100644 --- a/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php +++ b/app/code/core/Mage/Cron/Model/Mysql4/Schedule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php index 31fe6736cbb..898e718799b 100644 --- a/app/code/core/Mage/Cron/Model/Observer.php +++ b/app/code/core/Mage/Cron/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Crontab observer * - * @category Mage - * @package Mage_Cron - * @author Magento Core Team + * @category Mage + * @package Mage_Cron + * @author Magento Core Team */ class Mage_Cron_Model_Observer { diff --git a/app/code/core/Mage/Cron/Model/Resource/Schedule.php b/app/code/core/Mage/Cron/Model/Resource/Schedule.php index be77e10e811..d02fa5fa2ee 100644 --- a/app/code/core/Mage/Cron/Model/Resource/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Resource/Schedule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Schedule mysql4 resource * - * @category Mage - * @package Mage_Cron - * @author Magento Core Team + * @category Mage + * @package Mage_Cron + * @author Magento Core Team */ class Mage_Cron_Model_Resource_Schedule extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php index 2aa0b0ea7b4..66295c8daea 100644 --- a/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php +++ b/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php index d5233fc2a71..f200271eb30 100644 --- a/app/code/core/Mage/Cron/Model/Schedule.php +++ b/app/code/core/Mage/Cron/Model/Schedule.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Crontab schedule model * + * @category Mage + * @package Mage_Cron + * @author Magento Core Team + * * @method Mage_Cron_Model_Resource_Schedule _getResource() * @method Mage_Cron_Model_Resource_Schedule getResource() * @method Mage_Cron_Model_Resource_Schedule_Collection getCollection() @@ -41,10 +46,6 @@ * @method $this unsScheduleId() * @method array[]|false|string[] getCronExprArr() * @method $this setCronExprArr(array[]|false|string[] $value) - * - * @category Mage - * @package Mage_Cron - * @author Magento Core Team */ class Mage_Cron_Model_Schedule extends Mage_Core_Model_Abstract { @@ -66,7 +67,7 @@ public function _construct() */ public function setCronExpr($expr) { - $e = preg_split('#\s+#', $expr, null, PREG_SPLIT_NO_EMPTY); + $e = preg_split('#\s+#', $expr, -1, PREG_SPLIT_NO_EMPTY); if (count($e) < 5 || count($e) > 6) { throw Mage::exception('Mage_Cron', 'Invalid cron expression: '.$expr); } @@ -81,7 +82,7 @@ public function setCronExpr($expr) * Supports $this->setCronExpr('* 0-5,10-59/5 2-10,15-25 january-june/2 mon-fri') * * @param string|int $time - * @return boolean + * @return bool */ public function trySchedule($time) { @@ -226,7 +227,7 @@ public function getNumeric($value) * @param string $oldStatus * This is used to implement locking for cron jobs. * - * @return boolean + * @return bool */ public function tryLockJob($oldStatus = self::STATUS_PENDING) { diff --git a/app/code/core/Mage/Cron/etc/config.xml b/app/code/core/Mage/Cron/etc/config.xml index 86a8a5f08c5..ec3bcba9880 100644 --- a/app/code/core/Mage/Cron/etc/config.xml +++ b/app/code/core/Mage/Cron/etc/config.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. (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/Cron/etc/system.xml b/app/code/core/Mage/Cron/etc/system.xml index 64a0e47915d..15ce604eeab 100644 --- a/app/code/core/Mage/Cron/etc/system.xml +++ b/app/code/core/Mage/Cron/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php b/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php index 769c4d30836..c9306ffb225 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php index 30fbe89ccb3..e9889752b25 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php index 3e83fb91e34..674a5491497 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" diff --git a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 17457b5b318..a98b8cd314f 100644 --- a/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Cron/sql/cron_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Cron + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php index ad8753582bb..5c1fb91b5a3 100644 --- a/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CurrencySymbol - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,9 +35,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'; @@ -64,7 +62,7 @@ protected function _prepareLayout() /** * Returns page header * - * @return bool|string + * @return string */ public function getHeader() { diff --git a/app/code/core/Mage/CurrencySymbol/Helper/Data.php b/app/code/core/Mage/CurrencySymbol/Helper/Data.php index 9bb7debe074..a8cccdb85f6 100644 --- a/app/code/core/Mage/CurrencySymbol/Helper/Data.php +++ b/app/code/core/Mage/CurrencySymbol/Helper/Data.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CurrencySymbol - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - /** +/** * Currency Symbol helper * * @category Mage @@ -27,6 +28,8 @@ */ class Mage_CurrencySymbol_Helper_Data extends Mage_Core_Helper_Data { + protected $_moduleName = 'Mage_CurrencySymbol'; + /** * Get currency display options * diff --git a/app/code/core/Mage/CurrencySymbol/Model/Observer.php b/app/code/core/Mage/CurrencySymbol/Model/Observer.php index a7bdae06f94..cb0acff50f5 100644 --- a/app/code/core/Mage/CurrencySymbol/Model/Observer.php +++ b/app/code/core/Mage/CurrencySymbol/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CurrencySymbol - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_CurrencySymbol + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Currency Symbol Observer * - * @category Mage - * @package Mage_CurrencySymbol - * @author Magento Core Team + * @category Mage + * @package Mage_CurrencySymbol + * @author Magento Core Team */ class Mage_CurrencySymbol_Model_Observer { diff --git a/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php index 87e9ec773e0..c288d6e8b0a 100644 --- a/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CurrencySymbol - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..344dd36890b 100644 --- a/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php +++ b/app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_CurrencySymbol - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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 8158311c6d0..b07713170c0 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/adminhtml.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/adminhtml.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_CurrencySymbol - * @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_CurrencySymbol + * @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/CurrencySymbol/etc/config.xml b/app/code/core/Mage/CurrencySymbol/etc/config.xml index 21c0f1b62f6..5c2d0e0761d 100644 --- a/app/code/core/Mage/CurrencySymbol/etc/config.xml +++ b/app/code/core/Mage/CurrencySymbol/etc/config.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_CurrencySymbol - * @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_CurrencySymbol + * @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/Customer/Block/Account.php b/app/code/core/Mage/Customer/Block/Account.php index d56d3388cd9..515ff861790 100644 --- a/app/code/core/Mage/Customer/Block/Account.php +++ b/app/code/core/Mage/Customer/Block/Account.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Changeforgotten.php b/app/code/core/Mage/Customer/Block/Account/Changeforgotten.php index 72305abfb1b..c858a9b0726 100644 --- a/app/code/core/Mage/Customer/Block/Account/Changeforgotten.php +++ b/app/code/core/Mage/Customer/Block/Account/Changeforgotten.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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..186a4bcd601 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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/Address.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php index 05d295f4f90..08f81b429b2 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php index 986099949a6..c7a5bd8a00c 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class Mage_Customer_Block_Account_Dashboard_Block extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php index 4101f2a9088..3879258d3e8 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Hello.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php index b5a26bbd046..90701ad6113 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -77,7 +78,7 @@ public function getIsSubscribed() /** * Newsletter module availability * - * @return boolean + * @return bool */ public function isNewsletterEnabled() { diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php index 074252151fe..7740b67325b 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Newsletter.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team * * @property Mage_Newsletter_Model_Subscriber $_subscription */ 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..de699fa191f 100644 --- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php +++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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/Account/Forgotpassword.php b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php index b8b95bff75a..762fc91708a 100644 --- a/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php +++ b/app/code/core/Mage/Customer/Block/Account/Forgotpassword.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Account/Navigation.php b/app/code/core/Mage/Customer/Block/Account/Navigation.php index 41ec144ba1b..b83545db532 100644 --- a/app/code/core/Mage/Customer/Block/Account/Navigation.php +++ b/app/code/core/Mage/Customer/Block/Account/Navigation.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Customer_Block_Account_Navigation extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Customer/Block/Account/Resetpassword.php b/app/code/core/Mage/Customer/Block/Account/Resetpassword.php index 7e0c820b952..5fe5cf2e2f2 100644 --- a/app/code/core/Mage/Customer/Block/Account/Resetpassword.php +++ b/app/code/core/Mage/Customer/Block/Account/Resetpassword.php @@ -7,29 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer reset password form * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team - */ - -/** + * @category Mage + * @package Mage_Customer + * @author Magento Core Team * @deprecated */ class Mage_Customer_Block_Account_Resetpassword extends Mage_Core_Block_Template { - } diff --git a/app/code/core/Mage/Customer/Block/Address/Book.php b/app/code/core/Mage/Customer/Block/Address/Book.php index bd783fa18a8..2242dccf1fd 100644 --- a/app/code/core/Mage/Customer/Block/Address/Book.php +++ b/app/code/core/Mage/Customer/Block/Address/Book.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Edit.php b/app/code/core/Mage/Customer/Block/Address/Edit.php index 71967ad51f1..66c9ee32b74 100644 --- a/app/code/core/Mage/Customer/Block/Address/Edit.php +++ b/app/code/core/Mage/Customer/Block/Address/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php index 8a472ffdc14..43ee652776f 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php index 7ad7c1a5f36..56cbcf03bf2 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Customer_Block_Address_Renderer_Interface { diff --git a/app/code/core/Mage/Customer/Block/Form/Edit.php b/app/code/core/Mage/Customer/Block/Form/Edit.php index 2b56cad46d6..64790a055aa 100644 --- a/app/code/core/Mage/Customer/Block/Form/Edit.php +++ b/app/code/core/Mage/Customer/Block/Form/Edit.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Form/Login.php b/app/code/core/Mage/Customer/Block/Form/Login.php index e933a010508..0f36e6bdc56 100644 --- a/app/code/core/Mage/Customer/Block/Form/Login.php +++ b/app/code/core/Mage/Customer/Block/Form/Login.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team * * @method $this setCreateAccountUrl(string $value) */ @@ -109,7 +110,6 @@ public function canShowLogin() if (Mage::getStoreConfigFlag(Mage_Customer_Helper_Data::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD)) { $url = Mage::helper('customer')->getDashboardUrl(); } else { - /** @var string $pathInfo 'something.html'|'/'|'/path0'|'/path0/path1/'|'/path0/path1/path2'|etc */ $pathInfo = $this->getRequest()->getOriginalPathInfo(); if (strtolower(substr($pathInfo, -5)) === '.html') { // For URL rewrite, preserve the path without considering query or post. diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php index 88489b0503d..c8e248b7ee4 100644 --- a/app/code/core/Mage/Customer/Block/Form/Register.php +++ b/app/code/core/Mage/Customer/Block/Form/Register.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer register form block * - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team * * @method $this setBackUrl(string $value) * @method $this setErrorUrl(string $value) @@ -114,15 +117,15 @@ public function getCountryId() /** * Retrieve customer region identifier * - * @return int + * @return string|int|null */ public function getRegion() { - if ($region = $this->getFormData()->getRegion() !== false) { + if (($region = $this->getFormData()->getRegion()) !== false) { return $region; } - if ($region = $this->getFormData()->getRegionId() !== false) { + if (($region = $this->getFormData()->getRegionId()) !== false) { return $region; } return null; @@ -131,7 +134,7 @@ public function getRegion() /** * Newsletter module availability * - * @return boolean + * @return bool */ public function isNewsletterEnabled() { diff --git a/app/code/core/Mage/Customer/Block/Newsletter.php b/app/code/core/Mage/Customer/Block/Newsletter.php index 10424888132..c9137228788 100644 --- a/app/code/core/Mage/Customer/Block/Newsletter.php +++ b/app/code/core/Mage/Customer/Block/Newsletter.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Customer_Block_Newsletter extends Mage_Customer_Block_Account_Dashboard // Mage_Core_Block_Template { - public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Customer/Block/Widget/Abstract.php b/app/code/core/Mage/Customer/Block/Widget/Abstract.php index 837c701f3af..3d231263e1b 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Abstract.php +++ b/app/code/core/Mage/Customer/Block/Widget/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Dob.php b/app/code/core/Mage/Customer/Block/Widget/Dob.php index f5d6624ee4e..7c7bc28e141 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Dob.php +++ b/app/code/core/Mage/Customer/Block/Widget/Dob.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Gender.php b/app/code/core/Mage/Customer/Block/Widget/Gender.php index cbe7a8b74e9..c45e63441bd 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Gender.php +++ b/app/code/core/Mage/Customer/Block/Widget/Gender.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php index cc6c1a54e54..1371067e22d 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Name.php +++ b/app/code/core/Mage/Customer/Block/Widget/Name.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Customer_Block_Widget_Name * + * @category Mage + * @package Mage_Customer + * @author Magento Core Team + * * @method bool getForceUseCustomerAttributes() * @method bool getForceUseCustomerRequiredAttributes() */ diff --git a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php index 69d13588ab8..fb3fda724aa 100644 --- a/app/code/core/Mage/Customer/Block/Widget/Taxvat.php +++ b/app/code/core/Mage/Customer/Block/Widget/Taxvat.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Exception.php b/app/code/core/Mage/Customer/Exception.php index 0e6b1df5148..dbe5a07bb01 100644 --- a/app/code/core/Mage/Customer/Exception.php +++ b/app/code/core/Mage/Customer/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Helper/Address.php b/app/code/core/Mage/Customer/Helper/Address.php index ffb3e90fc95..7ce925ea194 100644 --- a/app/code/core/Mage/Customer/Helper/Address.php +++ b/app/code/core/Mage/Customer/Helper/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,6 +37,8 @@ class Mage_Customer_Helper_Address extends Mage_Core_Helper_Abstract const XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE = 'customer/create_account/tax_calculation_address_type'; const XML_PATH_VAT_FRONTEND_VISIBILITY = 'customer/create_account/vat_frontend_visibility'; + protected $_moduleName = 'Mage_Customer'; + /** * Array of Customer Address Attributes * @@ -177,8 +180,7 @@ public function getAttributes() public function getAttributeValidationClass($attributeCode) { /** @var Mage_Customer_Model_Attribute $attribute */ - $attribute = isset($this->_attributes[$attributeCode]) ? $this->_attributes[$attributeCode] - : Mage::getSingleton('eav/config')->getAttribute('customer_address', $attributeCode); + $attribute = $this->_attributes[$attributeCode] ?? Mage::getSingleton('eav/config')->getAttribute('customer_address', $attributeCode); $class = $attribute ? $attribute->getFrontend()->getClass() : ''; if (in_array($attributeCode, ['firstname', 'middlename', 'lastname', 'prefix', 'suffix', 'taxvat'])) { @@ -282,7 +284,7 @@ public function getTaxCalculationAddressType($store = null) /** * Check if VAT ID address attribute has to be shown on frontend (on Customer Address management forms) * - * @return boolean + * @return bool */ public function isVatAttributeVisible() { diff --git a/app/code/core/Mage/Customer/Helper/Data.php b/app/code/core/Mage/Customer/Helper/Data.php index 52665d72ea5..6eaa7b2e3ec 100644 --- a/app/code/core/Mage/Customer/Helper/Data.php +++ b/app/code/core/Mage/Customer/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,6 +94,8 @@ class Mage_Customer_Helper_Data extends Mage_Core_Helper_Abstract const VAT_CLASS_INVALID = 'invalid'; const VAT_CLASS_ERROR = 'error'; + protected $_moduleName = 'Mage_Customer'; + /** * @var Mage_Customer_Model_Customer */ @@ -581,7 +584,7 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode = // Send request to service $result = $soapClient->checkVatApprox($requestParams); - $gatewayResponse->setIsValid((boolean) $result->valid); + $gatewayResponse->setIsValid((bool) $result->valid); $gatewayResponse->setRequestDate((string) $result->requestDate); $gatewayResponse->setRequestIdentifier((string) $result->requestIdentifier); $gatewayResponse->setRequestSuccess(true); @@ -602,7 +605,7 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode = * @param string $requesterCountryCode * @param string $requesterVatNumber * - * @return boolean + * @return bool */ public function canCheckVatNumber($countryCode, $vatNumber, $requesterCountryCode, $requesterVatNumber) { @@ -728,7 +731,7 @@ public function getPasswordTimestamp($customerId) /** * Create SOAP client based on VAT validation service WSDL * - * @param boolean $trace + * @param bool $trace * @return SoapClient */ protected function _createVatNumberValidationSoapClient($trace = false) diff --git a/app/code/core/Mage/Customer/Model/Address.php b/app/code/core/Mage/Customer/Model/Address.php index 8bc67ad3ee8..95f1fb1d7ac 100644 --- a/app/code/core/Mage/Customer/Model/Address.php +++ b/app/code/core/Mage/Customer/Model/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +46,7 @@ protected function _construct() /** * Retrieve address customer identifier * - * @return integer + * @return int */ public function getCustomerId() { @@ -55,7 +56,7 @@ public function getCustomerId() /** * Declare address customer identifier * - * @param integer $id + * @param int $id * @return $this */ public function setCustomerId($id) diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php index 8faeb6be82f..bbd144c9b8c 100644 --- a/app/code/core/Mage/Customer/Model/Address/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Address abstract model * * @category Mage - * @package Mage_Core + * @package Mage_Customer * @author Magento Core Team * * @method string getCustomerId() diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php index e066efd858e..39839994466 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api.php +++ b/app/code/core/Mage/Customer/Model/Address/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -58,7 +59,7 @@ public function items($customerId) $row = []; foreach ($this->_mapAttributes as $attributeAlias => $attributeCode) { - $row[$attributeAlias] = isset($data[$attributeCode]) ? $data[$attributeCode] : null; + $row[$attributeAlias] = $data[$attributeCode] ?? null; } foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) { @@ -164,7 +165,7 @@ public function info($addressId) * * @param int $addressId * @param array $addressData - * @return boolean + * @return bool */ public function update($addressId, $addressData) { @@ -207,7 +208,7 @@ public function update($addressId, $addressData) * Delete address * * @param int $addressId - * @return boolean + * @return bool */ public function delete($addressId) { 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..2f5d44cafbc 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -115,7 +116,7 @@ public function info($addressId) * * @param int $addressId * @param array $addressData - * @return boolean + * @return bool */ public function update($addressId, $addressData) { @@ -158,7 +159,7 @@ public function update($addressId, $addressData) * Delete address * * @param int $addressId - * @return boolean + * @return bool */ public function delete($addressId) { diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php index 8d03edf81d6..1eed438d54b 100644 --- a/app/code/core/Mage/Customer/Model/Address/Config.php +++ b/app/code/core/Mage/Customer/Model/Address/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Api/Resource.php b/app/code/core/Mage/Customer/Model/Api/Resource.php index 73d1aee9b67..0de4a6125c2 100644 --- a/app/code/core/Mage/Customer/Model/Api/Resource.php +++ b/app/code/core/Mage/Customer/Model/Api/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -45,8 +46,8 @@ class Mage_Customer_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract * Check is attribute allowed * * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute - * @param array $filter - * @return boolean + * @param array|null $filter + * @return bool */ protected function _isAllowedAttribute($attribute, array $filter = null) { @@ -64,7 +65,7 @@ protected function _isAllowedAttribute($attribute, array $filter = null) * Return list of allowed attributes * * @param Mage_Eav_Model_Entity_Abstract $entity - * @param array $filter + * @param array|null $filter * @return array */ public function getAllowedAttributes($entity, array $filter = null) diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer.php b/app/code/core/Mage/Customer/Model/Api2/Customer.php index 577d7eba579..0bbfd8a9157 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php index 3a5ebcff7fb..535cad4b453 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php index 6e398546f6e..39180e937c6 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Address/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -150,7 +151,7 @@ protected function _update(array $data) if (isset($data['region'])) { $data['region'] = $this->_getRegionIdByNameOrCode( $data['region'], - isset($data['country_id']) ? $data['country_id'] : $address->getCountryId() + $data['country_id'] ?? $address->getCountryId() ); $data['region_id'] = null; // to avoid overwrite region during update in address model _beforeSave() } 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..35e6e5b3c4b 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..851cc121843 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bd899b9cafe 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php index ec8cfb58f89..b1b6ef70ddd 100644 --- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php +++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -82,7 +83,7 @@ protected function _retrieve() protected function _retrieveCollection() { $data = $this->_getCollectionForRetrieve()->load()->toArray(); - return isset($data['items']) ? $data['items'] : $data; + return $data['items'] ?? $data; } /** 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..f4f4106d8c0 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c201328a5fd 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,7 +47,7 @@ protected function _isOwner($customerId) * Retrieve information about customer * * @throws Mage_Api2_Exception - * @return array + * @return array|void */ protected function _retrieve() { diff --git a/app/code/core/Mage/Customer/Model/Attribute.php b/app/code/core/Mage/Customer/Model/Attribute.php index 0b1e2452598..28dc252da0c 100644 --- a/app/code/core/Mage/Customer/Model/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Backend/Data/Boolean.php b/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php index 64cbc9d4df1..010c27b6870 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Backend/Data/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Customer/Model/Attribute/Data.php index 0f21a34a24d..834b9e8c71c 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Abstract.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php index c82791703e5..64c86859f13 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Boolean.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php index 04033673161..bf471022aa5 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Date.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php index 2b8e97a75ea..d7475aaae85 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/File.php b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php index f5d6bbac15f..b6fe98665f7 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Hidden.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php index f6639ccfa8b..c3cfe7dd5ce 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Hidden.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Image.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php index 97f0289190a..10d48a11bbc 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Multiline.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php index 7c1345cdade..c422291de0b 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiline.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute Multiply line 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_Multiline extends Mage_Eav_Model_Attribute_Data_Multiline { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php index e8524e6eca3..89e8fd42b9d 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Multiselect.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute Multiply select 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_Multiselect extends Mage_Eav_Model_Attribute_Data_Multiselect { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php index 8855a1024a6..d851a38f078 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Postcode.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Address Postal/Zip Code Attribute Data Model * This Data Model Has to Be Set Up in additional EAV attribute table * - * @category Mage - * @package Mage_Customer - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Attribute_Data_Postcode extends Mage_Eav_Model_Attribute_Data_Text { @@ -33,7 +34,7 @@ class Mage_Customer_Model_Attribute_Data_Postcode extends Mage_Eav_Model_Attribu * Return true and skip validation if country zip code is optional * * @param array|string $value - * @return boolean|array + * @return bool|array */ public function validateValue($value) { diff --git a/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php b/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php index 9940ff17c28..dc1cf578288 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Select.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Attribute Select 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_Select extends Mage_Eav_Model_Attribute_Data_Select { 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..28ab8e4a022 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Text.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2a2691d98ca 100644 --- a/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Customer/Model/Attribute/Data/Textarea.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..b1bff21658c 100644 --- a/app/code/core/Mage/Customer/Model/Config/Share.php +++ b/app/code/core/Mage/Customer/Model/Config/Share.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..9822b2fe10a 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -184,11 +185,7 @@ public function getRegionId($country, $regionName) } } - if (isset($this->_regions[$country][$regionName])) { - return $this->_regions[$country][$regionName]; - } - - return 0; + return $this->_regions[$country][$regionName] ?? 0; } /** @@ -460,7 +457,7 @@ public function saveRow($importData) * Check customer group */ if (empty($importData['group']) || !isset($customerGroups[$importData['group']])) { - $value = isset($importData['group']) ? $importData['group'] : ''; + $value = $importData['group'] ?? ''; $message = Mage::helper('catalog')->__('Skipping import row, the value "%s" is not valid for the "%s" field.', $value, 'group'); Mage::throwException($message); } @@ -628,7 +625,7 @@ public function saveRow($importData) } $billingAddress->setCountryId($importData['billing_country']); - $regionName = isset($importData['billing_region']) ? $importData['billing_region'] : ''; + $regionName = $importData['billing_region'] ?? ''; if ($regionName) { $regionId = $this->getRegionId($importData['billing_country'], $regionName); $billingAddress->setRegionId($regionId); @@ -681,7 +678,7 @@ public function saveRow($importData) } $shippingAddress->setCountryId($importData['shipping_country']); - $regionName = isset($importData['shipping_region']) ? $importData['shipping_region'] : ''; + $regionName = $importData['shipping_region'] ?? ''; if ($regionName) { $regionId = $this->getRegionId($importData['shipping_country'], $regionName); $shippingAddress->setRegionId($regionId); 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..5462fffbaed 100644 --- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php +++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -442,11 +443,7 @@ protected function _getCustomerGroupCode($customer) } } - if (isset($this->_customerGroups[$customer->getGroupId()])) { - return $this->_customerGroups[$customer->getGroupId()]; - } else { - return null; - } + return $this->_customerGroups[$customer->getGroupId()] ?? null; } /** @@ -495,7 +492,7 @@ public function parse() } // get store ids - $storeIds = $this->getStoreIds(isset($row['store']) ? $row['store'] : $this->getVar('store')); + $storeIds = $this->getStoreIds($row['store'] ?? $this->getVar('store')); if (!$storeIds) { $this->addException(Mage::helper('customer')->__("Invalid store specified, skipping the record."), Varien_Convert_Exception::ERROR); continue; diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index 384c3225787..74bd50ade3b 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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() @@ -213,14 +214,14 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract /** * Is model deleteable * - * @var boolean + * @var bool */ protected $_isDeleteable = true; /** * Is model readonly * - * @var boolean + * @var bool */ protected $_isReadonly = false; @@ -234,7 +235,7 @@ class Mage_Customer_Model_Customer extends Mage_Core_Model_Abstract /** * Confirmation requirement flag * - * @var boolean + * @var bool */ private static $_isConfirmationRequired; @@ -468,10 +469,7 @@ public function getAttributes() public function getAttribute($attributeCode) { $this->getAttributes(); - if (isset($this->_attributes[$attributeCode])) { - return $this->_attributes[$attributeCode]; - } - return null; + return $this->_attributes[$attributeCode] ?? null; } /** @@ -536,7 +534,7 @@ public function generatePassword($length = 8) * Validate password with salted hash * * @param string $password - * @return boolean + * @return bool * @throws Exception */ public function validatePassword($password) @@ -694,7 +692,7 @@ public function getAdditionalAddresses() * Check if address is primary * * @param Mage_Customer_Model_Address $address - * @return boolean + * @return bool */ public function isAddressPrimary(Mage_Customer_Model_Address $address) { @@ -1327,7 +1325,7 @@ public function resetErrors() * * @param null|string $error * @param string $line - * @return boolean + * @return false|void * @throws Exception */ public function printError($error, $line = null) @@ -1423,7 +1421,7 @@ public function reset() /** * Checks model is deleteable * - * @return boolean + * @return bool */ public function isDeleteable() { @@ -1433,7 +1431,7 @@ public function isDeleteable() /** * Set is deleteable flag * - * @param boolean $value + * @param bool $value * @return $this */ public function setIsDeleteable($value) @@ -1445,7 +1443,7 @@ public function setIsDeleteable($value) /** * Checks model is readonly * - * @return boolean + * @return bool */ public function isReadonly() { @@ -1455,7 +1453,7 @@ public function isReadonly() /** * Set is readonly flag * - * @param boolean $value + * @param bool $value * @return $this */ public function setIsReadonly($value) @@ -1580,7 +1578,7 @@ public function changeResetPasswordLinkCustomerId($newResetPasswordLinkCustomerI /** * Check if current reset password link token is expired * - * @return boolean + * @return bool */ public function isResetPasswordLinkTokenExpired() { diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php index 3525d1d967a..6bd731d8fa9 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -125,7 +126,7 @@ public function items($filters) $data = $customer->toArray(); $row = []; foreach ($this->_mapAttributes as $attributeAlias => $attributeCode) { - $row[$attributeAlias] = (isset($data[$attributeCode]) ? $data[$attributeCode] : null); + $row[$attributeAlias] = $data[$attributeCode] ?? null; } foreach ($this->getAllowedAttributes($customer) as $attributeCode => $attribute) { if (isset($data[$attributeCode])) { @@ -143,7 +144,7 @@ public function items($filters) * * @param int $customerId * @param array $customerData - * @return boolean + * @return bool */ public function update($customerId, $customerData) { @@ -169,7 +170,7 @@ public function update($customerId, $customerData) * Delete customer * * @param int $customerId - * @return boolean + * @return bool */ public function delete($customerId) { 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..1bdef06c6e1 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Customer/Api/V2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Billing.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php index 55afed23a63..0af7d78c548 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Password.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php index 96d99ea78db..1152165a288 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Customer_Model_Customer_Attribute_Backend_Password extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { @@ -33,6 +34,7 @@ class Mage_Customer_Model_Customer_Attribute_Backend_Password extends Mage_Eav_M * b) transform temporary attribute 'password' into real attribute 'password_hash' * * @param Mage_Customer_Model_Customer $object + * @return $this * @throws Mage_Core_Exception */ public function beforeSave($object) @@ -49,6 +51,7 @@ public function beforeSave($object) } $object->setPasswordHash($object->hashPassword($password)); } + return $this; } /** 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..70adfbf47ba 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..26c57e7f449 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..15e9e9a6d26 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Group.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php index 064c63fa95e..9ed19968444 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) * @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/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php index 44447f67fd7..d3011205234 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..ad90eb69d73 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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.php b/app/code/core/Mage/Customer/Model/Entity/Address.php index 6623440716f..10a8d8d75e4 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php index 8ae7d3f3970..6c2212522dd 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Backend/Region.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Address region 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_Region extends Mage_Customer_Model_Resource_Address_Attribute_Backend_Region { 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..6ad38831831 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php index 547cec1c9f2..96ebf2b9b07 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..a03701c2908 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,8 +36,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/Address/Attribute/Source/Region.php b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php index 3515f72de17..57de0d5d332 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Attribute/Source/Region.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer region attribute source * - * @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_Source_Region extends Mage_Customer_Model_Resource_Address_Attribute_Source_Region { diff --git a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php index 234e47bb6e7..16a622f2a32 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Address/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute.php b/app/code/core/Mage/Customer/Model/Entity/Attribute.php index a7238260fc4..dc71ffc840e 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Entity/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php index 9853d817230..1edf8dc8e2e 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer.php b/app/code/core/Mage/Customer/Model/Entity/Customer.php index b308ba69b24..ecf83b1d253 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Customer.php +++ b/app/code/core/Mage/Customer/Model/Entity/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php index 4627bb67bdf..14be76b6f42 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php index fc5a2812839..8193226a9f5 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php index 653c7b47139..94a148e9e5c 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Form/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Group.php b/app/code/core/Mage/Customer/Model/Entity/Group.php index c71fbf1e626..3176deb6a71 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php index f0d8fd450f2..8ae196b834a 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Group/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Entity/Setup.php b/app/code/core/Mage/Customer/Model/Entity/Setup.php index 83251e74e64..984b88f03f3 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Setup.php +++ b/app/code/core/Mage/Customer/Model/Entity/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Entity/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php index 748926a130d..0877014a445 100644 --- a/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php +++ b/app/code/core/Mage/Customer/Model/Entity/Wishlist/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Flowpassword.php b/app/code/core/Mage/Customer/Model/Flowpassword.php index ef839839d59..cc6bb3c9936 100644 --- a/app/code/core/Mage/Customer/Model/Flowpassword.php +++ b/app/code/core/Mage/Customer/Model/Flowpassword.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Form.php b/app/code/core/Mage/Customer/Model/Form.php index 3d0d1e756e6..c1d20812cd9 100644 --- a/app/code/core/Mage/Customer/Model/Form.php +++ b/app/code/core/Mage/Customer/Model/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Group.php b/app/code/core/Mage/Customer/Model/Group.php index 30f0b5f96b9..08525470ec9 100644 --- a/app/code/core/Mage/Customer/Model/Group.php +++ b/app/code/core/Mage/Customer/Model/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Group/Api.php b/app/code/core/Mage/Customer/Model/Group/Api.php index 9468c289529..6444a1ad855 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api.php +++ b/app/code/core/Mage/Customer/Model/Group/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..c46cc44f606 100644 --- a/app/code/core/Mage/Customer/Model/Group/Api/V2.php +++ b/app/code/core/Mage/Customer/Model/Group/Api/V2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Customer/Model/Observer.php b/app/code/core/Mage/Customer/Model/Observer.php index 083b3297b93..f0e1d70f9ce 100644 --- a/app/code/core/Mage/Customer/Model/Observer.php +++ b/app/code/core/Mage/Customer/Model/Observer.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer module observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Customer + * @author Magento Core Team */ class Mage_Customer_Model_Observer { diff --git a/app/code/core/Mage/Customer/Model/Resource/Address.php b/app/code/core/Mage/Customer/Model/Resource/Address.php index a0d2a4e3bf8..bd2d5660a7a 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Customer_Model_Resource_Address extends Mage_Eav_Model_Entity_Abstract { - /** - * Resource initialization - */ protected function _construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php index 3c9e173361b..3cd986dce13 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Backend/Region.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Address region 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_Region extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { 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..5de35c5f3e1 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 @@ -7,30 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** * Prepare object for save * - * @param Varien_Object|Mage_Customer_Model_Address_Abstract $object + * @param Mage_Customer_Model_Address_Abstract $object * @return $this */ public function beforeSave($object) diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php index 75cb689f547..0f775c5289e 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Source/Country.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php index cf1eff5a0bc..45198a0438a 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Source/Region.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php index 1d1dc762990..27e2b867b29 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Source/Region.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer region attribute source * - * @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_Source_Region extends Mage_Eav_Model_Entity_Attribute_Source_Table { diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php index f6da1fc3bf4..081fed0620c 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Address/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,9 +31,6 @@ */ class Mage_Customer_Model_Resource_Address_Collection extends Mage_Eav_Model_Entity_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('customer/address'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Attribute.php b/app/code/core/Mage/Customer/Model/Resource/Attribute.php index bf765395208..365c5d11881 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Resource/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php index 6c384ec4841..396ae519c0f 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php index 26e738d9068..865da0a61ea 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Customer.php +++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Customer_Model_Resource_Customer extends Mage_Eav_Model_Entity_Abstract { - /** - * Resource initialization - */ public function __construct() { $this->setType('customer'); @@ -57,7 +55,7 @@ protected function _getDefaultAttributes() /** * Check customer scope, email and confirmation key before saving * - * @param Varien_Object|Mage_Customer_Model_Customer $customer + * @param Mage_Customer_Model_Customer $customer * @return $this * @throws Mage_Core_Exception */ diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php index ef614c9dba7..6fe7ce6f2f4 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,6 @@ */ class Mage_Customer_Model_Resource_Customer_Collection extends Mage_Eav_Model_Entity_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('customer/customer'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php b/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php index 8a37668d4a8..42ac55aa6fb 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php +++ b/app/code/core/Mage/Customer/Model/Resource/Flowpassword.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Customer_Model_Resource_Flowpassword extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('customer/flowpassword', 'flowpassword_id'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php index f0202f2f551..b18ebb3ec31 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Customer_Model_Resource_Flowpassword_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('customer/flowpassword'); 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..3106cc3bade 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php +++ b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Form/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php index 9eaf29f3912..6a8edc193a6 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Form/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,9 +42,6 @@ class Mage_Customer_Model_Resource_Form_Attribute_Collection extends Mage_Eav_Mo */ protected $_entityTypeCode = 'customer'; - /** - * Resource initialization - */ protected function _construct() { parent::_construct(); diff --git a/app/code/core/Mage/Customer/Model/Resource/Group.php b/app/code/core/Mage/Customer/Model/Resource/Group.php index bc33a518c7e..802824bdbe6 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Customer_Model_Resource_Group extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('customer/customer_group', 'customer_group_id'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php index e75d898b536..d5ec7d00d73 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Group/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Customer_Model_Resource_Group_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('customer/group'); diff --git a/app/code/core/Mage/Customer/Model/Resource/Setup.php b/app/code/core/Mage/Customer/Model/Resource/Setup.php index b508d3c317b..334917428a3 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Setup.php +++ b/app/code/core/Mage/Customer/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -73,8 +74,8 @@ public function installCustomerForms() $attributes = $entities['customer']['attributes']; foreach ($attributes as $attributeCode => $attribute) { $attributeId = $attributeIds[$customer][$attributeCode]; - $attribute['system'] = isset($attribute['system']) ? $attribute['system'] : true; - $attribute['visible'] = isset($attribute['visible']) ? $attribute['visible'] : true; + $attribute['system'] = $attribute['system'] ?? true; + $attribute['visible'] = $attribute['visible'] ?? true; if ($attribute['system'] != true || $attribute['visible'] != false) { $usedInForms = [ 'customer_account_create', @@ -101,8 +102,8 @@ public function installCustomerForms() $attributes = $entities['customer_address']['attributes']; foreach ($attributes as $attributeCode => $attribute) { $attributeId = $attributeIds[$customerAddress][$attributeCode]; - $attribute['system'] = isset($attribute['system']) ? $attribute['system'] : true; - $attribute['visible'] = isset($attribute['visible']) ? $attribute['visible'] : true; + $attribute['system'] = $attribute['system'] ?? true; + $attribute['visible'] = $attribute['visible'] ?? true; if (($attribute['system'] == true && $attribute['visible'] == false) === false) { $usedInForms = [ 'adminhtml_customer_address', diff --git a/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php index 4122f53f4d9..d71e3b6f52d 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Customer/Model/Resource/Wishlist/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/Model/Session.php b/app/code/core/Mage/Customer/Model/Session.php index 2fc33190c4e..c452582dc34 100644 --- a/app/code/core/Mage/Customer/Model/Session.php +++ b/app/code/core/Mage/Customer/Model/Session.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +57,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/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php index 7df4da80b19..d507721fcf0 100644 --- a/app/code/core/Mage/Customer/controllers/AccountController.php +++ b/app/code/core/Mage/Customer/controllers/AccountController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,6 +85,7 @@ public function preDispatch() } else { $this->_getSession()->setNoReferer(true); } + return $this; } /** @@ -410,7 +412,7 @@ protected function _escapeHtml($text) * Validate customer data and return errors if they are * * @param Mage_Customer_Model_Customer $customer - * @return array|string + * @return array */ protected function _getCustomerErrors($customer) { diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php index 0d424a1fe0b..df2b1e42839 100644 --- a/app/code/core/Mage/Customer/controllers/AddressController.php +++ b/app/code/core/Mage/Customer/controllers/AddressController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -43,10 +44,10 @@ protected function _getSession() public function preDispatch() { parent::preDispatch(); - if (!Mage::getSingleton('customer/session')->authenticate($this)) { $this->setFlag('', 'no-dispatch', true); } + return $this; } /** diff --git a/app/code/core/Mage/Customer/controllers/ReviewController.php b/app/code/core/Mage/Customer/controllers/ReviewController.php index f7caea2cdcb..b100b6a0f98 100644 --- a/app/code/core/Mage/Customer/controllers/ReviewController.php +++ b/app/code/core/Mage/Customer/controllers/ReviewController.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_ReviewController extends Mage_Core_Controller_Front_Action { public function indexAction() diff --git a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php index bb5cacf2bf3..16091993914 100644 --- a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php +++ b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.2-1.6.2.0.3.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php index a379263a448..216f8150b3d 100644 --- a/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php +++ b/app/code/core/Mage/Customer/data/customer_setup/data-upgrade-1.6.2.0.4-1.6.2.0.5.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml index 44cfbc4364e..624e23f00e3 100644 --- a/app/code/core/Mage/Customer/etc/adminhtml.xml +++ b/app/code/core/Mage/Customer/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 a61b3f12242..3200e3b7e98 100644 --- a/app/code/core/Mage/Customer/etc/api.xml +++ b/app/code/core/Mage/Customer/etc/api.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. (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/Customer/etc/api2.xml b/app/code/core/Mage/Customer/etc/api2.xml index 747169bb20d..140c745048e 100644 --- a/app/code/core/Mage/Customer/etc/api2.xml +++ b/app/code/core/Mage/Customer/etc/api2.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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 ac58ce61b33..b643b326130 100644 --- a/app/code/core/Mage/Customer/etc/config.xml +++ b/app/code/core/Mage/Customer/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2018-2021 The OpenMage Contributors (https://www.openmage.org) + * @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..87f8c9ae4b6 100644 --- a/app/code/core/Mage/Customer/etc/system.xml +++ b/app/code/core/Mage/Customer/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php index 37537690a9f..21af97be206 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php index d6d6f620e84..7dfb4e9412a 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.11-1.4.0.0.12.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $this */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php index de205fc4b73..7486976a223 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.13-1.4.0.0.14.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php index 522c9b707d3..062f6995b37 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php index a77546866fa..0cb500dc6f5 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-data-upgrade-1.4.0.0.8-1.4.0.0.9.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-install-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php index 331d671f005..221403383cd 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php index 57de849c237..f9f474a6104 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-0.8.0.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Customer install - * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Customer_Model_Entity_Setup $installer */ +/** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('customer_address_entity')}`; CREATE TABLE `{$installer->getTable('customer_address_entity')}` ( diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php index a61bd7163ba..d7aa86000b1 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-install-1.4.0.0.0.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Customer install - * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Customer_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('customer_address_entity')}`; CREATE TABLE `{$installer->getTable('customer_address_entity')}` ( diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php index 33bab92e547..7eb3b56b76f 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.6.1-0.7.0.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup()->run(" diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php index 0633a72fb46..cbca9df66c6 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Customer - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $this->getConnection()->dropColumn($this->getTable('customer_address_entity'), 'store_id'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php index 447dd82c5d7..a28b9595081 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $this->getConnection()->dropColumn($this->getTable('customer_address_entity'), 'store_id'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php index 74a1efd4aea..adba15a258d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->installEntities(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php index 23b36b3ac7e..5466214428d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->dropKey($installer->getTable('customer_address_entity_text'), 'IDX_VALUE'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php index c9e839eb95a..520ff593975 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); + $setup = $installer->getConnection(); $select = $setup->select() diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php index eefd0276851..53244baccea 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.12-1.4.0.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->updateEntityType('customer', 'additional_attribute_table', 'customer/eav_attribute'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php index 62b795bb0c9..c9c2d1534c6 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ if ($attrId = $this->getAttribute('customer', 'birthdate', 'attribute_id')) { diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php index bed4c127ada..d4708ddf066 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,8 +24,8 @@ * @see mysql4-upgrade-0.7.2-0.7.3.php */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $attributeId = $installer->getAttributeId('customer', 'email'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php index 09ff2d059eb..16f31a95992 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->addAttribute('customer', 'taxvat', [ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php index f9345bc9c75..73a0923e17c 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->addAttribute('customer', 'confirmation', [ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php index 9d2c9c21887..57224025991 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addKey($installer->getTable('customer_address_entity_datetime'), 'IDX_VALUE', ['entity_id', 'attribute_id', 'value']); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php index 3f342090acf..8d1d5b2b01f 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $tableCustomer = $tableCustomerAddress = $this->getTable('customer/address_entity'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php index 3ae4b781296..a7ad55ca2c3 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->addAttribute('customer', 'gender', [ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php index 48079f14162..60a8a33dc82 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $this->updateAttribute('customer', 'default_billing', 'frontend_label', 'Default Billing Address'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php index 0510d0f509e..bde50a869ca 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php index 0778310cfcd..584786a88cb 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php index 10652bcc721..091daf4a36b 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $this->addAttribute('customer', 'created_at', [ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php index df933d11335..ee337fd1796 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** @var Mage_Customer_Model_Entity_Setup $installer */ $installer = $this; -/** @var Mage_Customer_Model_Entity_Setup $installer */ $this->updateAttribute('customer_address', 'region_id', 'frontend_label', 'State/Province'); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php index d16995e101a..6dabd1a983d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Customer_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->updateAttribute('customer', 'dob', 'backend_model', ''); $installer->endSetup(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php index bcd3c82f85b..68607d9d106 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $installer */ $installer = $this; diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php index 5d877913fd3..9012f4ba2ec 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php index ca627d2c01f..4a36343934d 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('customer/eav_attribute_website')}` ( `attribute_id` smallint(5) unsigned NOT NULL, @@ -38,4 +39,5 @@ REFERENCES `{$installer->getTable('core/website')}` (`website_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php index b70b296ad32..6e83ade01f4 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index c9b0f60d478..65ade7c5ec7 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Customer_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php index a99ae53a4ee..23c360bfc5e 100644 --- a/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php +++ b/app/code/core/Mage/Customer/sql/customer_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.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..349b91279fb 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..09bb8f6c5e0 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6e84e08c601 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..50b0320c57a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..9a4d343625f 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..4abfb717150 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..98918c69e15 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Customer + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Helper/Data.php b/app/code/core/Mage/Dataflow/Helper/Data.php index eb0d0d4b5b0..2d2f409478c 100644 --- a/app/code/core/Mage/Dataflow/Helper/Data.php +++ b/app/code/core/Mage/Dataflow/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +25,5 @@ */ class Mage_Dataflow_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Dataflow'; } diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php index dcfddd09d97..0519a7f96ae 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Batch.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -131,6 +132,7 @@ protected function _beforeSave() protected function _afterDelete() { $this->getIoAdapter()->clear(); + return $this; } /** diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php index e6f79138bfc..007537ccef5 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Batch/Export.php index af3e2f703f3..9e198539067 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Export.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Batch/Import.php index 5fa00aacee9..4a79f7c028a 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Batch/Io.php b/app/code/core/Mage/Dataflow/Model/Batch/Io.php index 388576f830b..3424d9b57c2 100644 --- a/app/code/core/Mage/Dataflow/Model/Batch/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Batch/Io.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -158,7 +159,7 @@ public function write($string) * # length bytes have been read * # EOF (end of file) is reached * - * @return string|array + * @return false|string */ public function read($csv = false, $delimiter = ',', $enclosure = '"') { diff --git a/app/code/core/Mage/Dataflow/Model/Convert.php b/app/code/core/Mage/Dataflow/Model/Convert.php index 588928e19e7..1d5467c11a0 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert.php +++ b/app/code/core/Mage/Dataflow/Model/Convert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,7 +28,7 @@ */ class Mage_Dataflow_Model_Convert { - static public function convert($class, $method, $data, array $vars= []) + public static function convert($class, $method, $data, array $vars= []) { if (is_string($class)) { $class = new $class(); diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action.php b/app/code/core/Mage/Dataflow/Model/Convert/Action.php index 5bfc82a277b..9cbbf988eb8 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php index f5d60ffbda5..1c19794768d 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -66,10 +67,7 @@ abstract class Mage_Dataflow_Model_Convert_Action_Abstract */ public function getParam($key, $default=null) { - if (!isset($this->_params[$key])) { - return $default; - } - return $this->_params[$key]; + return $this->_params[$key] ?? $default; } /** diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php index e6a58429ec9..ed4499c0afc 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Action/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,16 +24,14 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Action_Interface { - /** * Run current action * * @return Mage_Dataflow_Model_Convert_Action_Abstract */ public function run(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php index 04d2bc672e5..868149089c6 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..756a4d1b125 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,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 +45,4 @@ public function save() { } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php index 618b3ab29e0..4684e28f0d2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +73,7 @@ public function loadFile() $uploader->save($path); if ($uploadFile = $uploader->getUploadedFileName()) { $session = Mage::getModel('dataflow/session'); - $session->setCreatedDate(date('Y-m-d H:i:s')); + $session->setCreatedDate(date(Varien_Date::DATETIME_PHP_FORMAT)); $session->setDirection('import'); $session->setUserId(Mage::getSingleton('admin/session')->getUser()->getId()); $session->save(); diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php index 098e4392d54..f28333215ee 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Http/Curl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php index 73e18f63198..1845656898a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,13 +24,11 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Adapter_Interface { - public function load(); public function save(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php index aff3d806ec7..4029d00e776 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,14 +24,14 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Adapter_Io extends Mage_Dataflow_Model_Convert_Adapter_Abstract { const XML_PATH_EXPORT_LOCAL_VALID_PATH = 'general/file/importexport_local_valid_paths'; /** - * @return Varien_Io_Abstract + * @return Varien_Io_Abstract|false */ public function getResource($forWrite = false) { @@ -49,7 +50,7 @@ public function getResource($forWrite = false) . DS . $ioConfig['filename']; /** @var Mage_Core_Model_File_Validator_AvailablePath $validator */ $validator = Mage::getModel('core/file_validator_availablePath'); - $validator->setPaths( Mage::getStoreConfig(self::XML_PATH_EXPORT_LOCAL_VALID_PATH) ); + $validator->setPaths(Mage::getStoreConfig(self::XML_PATH_EXPORT_LOCAL_VALID_PATH)); if (!$validator->isValid($path)) { foreach ($validator->getMessages() as $message) { Mage::throwException($message); @@ -59,7 +60,6 @@ public function getResource($forWrite = false) if (preg_match('#^' . preg_quote(DS, '#').'#', $this->getVar('path')) || preg_match('#^[a-z]:' . preg_quote(DS, '#') . '#i', $this->getVar('path'))) { - $path = $this->_resource->getCleanPath($this->getVar('path')); } else { $baseDir = Mage::getBaseDir(); 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..80236968c28 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Soap.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,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 +37,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..b86bd37bdd2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Std.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,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 +44,4 @@ public function save() echo $this->getData(); return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php index d223e313a59..e45ebab9783 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php index cf58c13fbe6..45565f8de87 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php index cfe47b08062..4f1c9c22c54 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -233,7 +234,7 @@ public function setBatchParams($data) public function getBatchParams($key = null) { if (!empty($key)) { - return isset($this->_batchParams[$key]) ? $this->_batchParams[$key] : null; + return $this->_batchParams[$key] ?? null; } return $this->_batchParams; } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php index 13dc0128691..e6782808c9e 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php index f879fdd2ae2..354493a35b7 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Generic.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php index 120594c4dc8..2c410de1f0e 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Container/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Container_Interface { - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php index 64b1a6eb378..63f12e48d9a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Exception.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php index ee6847ae8d7..a12a968f189 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ + +/** + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ class Mage_Dataflow_Model_Session_Adapter_Iterator extends Mage_Dataflow_Model_Convert_Adapter_Abstract { diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php index e8f33b24d90..ba95384dbfa 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php index 36bf0f38f96..f3e4622294f 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php index 3f7cedad7b0..710e1485346 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Iterator/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,9 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Iterator_Interface { - public function walk(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php index eb0f9389085..d75b5f929b8 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php index 4e692ff141a..5885f88ab68 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Column.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -130,7 +131,7 @@ public function map() $newRow = []; foreach ($attributesToSelect as $field => $mapField) { - $newRow[$mapField] = isset($row[$field]) ? $row[$field] : null; + $newRow[$mapField] = $row[$field] ?? null; } $batchExport->setBatchData($newRow) diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php index 28713c7d831..d6f8a71679a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Mapper/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,9 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Mapper_Interface { - public function map(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php index eff6fcdc991..05b6670d449 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php index 29333b9b3da..081f1ee162c 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -100,7 +101,7 @@ public function parse() $itemData = []; $countRows ++; $i = 0; foreach ($fieldNames as $field) { - $itemData[$field] = isset($csvData[$i]) ? $csvData[$i] : null; + $itemData[$field] = $csvData[$i] ?? null; $i ++; } @@ -142,7 +143,7 @@ public function parseRow($i, $line) $resultRow = []; foreach ($this->_fields as $j=>$f) { - $resultRow[$f] = isset($line[$j]) ? $line[$j] : ''; + $resultRow[$f] = $line[$j] ?? ''; } return $resultRow; } @@ -179,7 +180,7 @@ public function unparse() $row = $batchExport->getBatchData(); foreach ($fieldList as $field) { - $csvData[] = isset($row[$field]) ? $row[$field] : ''; + $csvData[] = $row[$field] ?? ''; } $csvData = $this->getCsvString($csvData); $io->write($csvData); diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php index def3cf73730..2cc6b402db7 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,13 +24,11 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Parser_Interface { - public function parse(); public function unparse(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php index 9699b300109..fb80181168e 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Serialize.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Parser_Serialize extends Mage_Dataflow_Model_Convert_Parser_Abstract { - public function parse() { $this->setData(unserialize($this->getData(), ['allowed_classes' => false])); @@ -39,5 +39,4 @@ public function unparse() $this->setData(serialize($this->getData())); return $this; } - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php index 7a122b4f87c..f6404798d1a 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -314,7 +315,7 @@ protected function _saveParsedRow($xmlString) $i = 0; foreach ($this->_parseFieldNames as $field) { - $itemData[$field] = isset($xmlData[$i]) ? $xmlData[$i] : null; + $itemData[$field] = $xmlData[$i] ?? null; $i ++; } @@ -375,7 +376,7 @@ public function unparse() $row = $batchExport->getBatchData(); foreach ($fieldList as $field) { - $xmlData[] = isset($row[$field]) ? $row[$field] : ''; + $xmlData[] = $row[$field] ?? ''; } $xmlData = $this->_getXmlString($xmlData); $io->write($xmlData); diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php index 8f28f884a59..b8cc81a8c55 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Dataflow_Model_Convert_Profile extends Mage_Dataflow_Model_Convert_Profile_Abstract { - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php index 851d19b7d9c..2d737e36abf 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php index 9b3394c516a..2069c9f069f 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php index ef55212aaa4..f6cf71bc385 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Profile/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,16 +24,14 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Profile_Interface { - /** * Run current action * * @return Mage_Dataflow_Model_Convert_Profile_Abstract */ public function run(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php index 0c6a117fd38..7eadd4be693 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php index 44119ca27bf..e1ecb5525b2 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Column.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php index 3862eaa735f..ad44f589ea8 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Dryrun.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php index 861e78f5fa2..dfd9436cf25 100644 --- a/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php +++ b/app/code/core/Mage/Dataflow/Model/Convert/Validator/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,9 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Dataflow_Model_Convert_Validator_Interface { - public function validate(); - } diff --git a/app/code/core/Mage/Dataflow/Model/Import.php b/app/code/core/Mage/Dataflow/Model/Import.php index 111d1043949..27c99b43eb1 100644 --- a/app/code/core/Mage/Dataflow/Model/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php index e0126c0efaf..63b3e14e91d 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php index c6e21009378..be43a1f1689 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php index 938ddf20136..b980d3fdc8b 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php index c2fb7804fdc..8f8e9bbe9a6 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Export.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php index 17b12665c56..8aa91e0fabc 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Batch/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php index d59f3e6a0c9..38c86033dcc 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Catalogold.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -74,7 +75,7 @@ public function getProductIdBySku($sku) $this->_productsBySku[$p['sku']] = $p['entity_id']; } } - return isset($this->_productsBySku[$sku]) ? $this->_productsBySku[$sku] : false; + return $this->_productsBySku[$sku] ?? false; } public function addProductToStore($productId, $storeId) diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php index 2e3cb86dc4a..46b25054adf 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php index 8add8c1b340..f3e9ae3629b 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Import/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php index a376d71ee11..6c18153339a 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert profile resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team * @deprecated */ class Mage_Dataflow_Model_Mysql4_Profile extends Mage_Dataflow_Model_Resource_Profile diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php index 0755d07d8e5..e83bae9fff5 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php index e5191f71b41..f1567b06741 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php index 526fb7c009d..efbf0b8f2ee 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Profile/History/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php index 5a826341521..64d9ee06525 100644 --- a/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Mysql4/Session.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php index 10ab68f9b88..a6eca0290c0 100644 --- a/app/code/core/Mage/Dataflow/Model/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Profile.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert profile * + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team + * * @method Mage_Dataflow_Model_Resource_Profile _getResource() * @method Mage_Dataflow_Model_Resource_Profile getResource() * @method string getName() @@ -43,10 +48,6 @@ * @method Mage_Dataflow_Model_Profile setDataTransfer(string $value) * @method int getAdminUserId() * @method Mage_Dataflow_Model_Profile setAdminUserId(int $value) - * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team */ class Mage_Dataflow_Model_Profile extends Mage_Core_Model_Abstract { @@ -247,6 +248,7 @@ protected function _afterSave() } } parent::_afterSave(); + return $this; } /** @@ -453,8 +455,8 @@ public function _parseGuiData() // Need to rewrite the whole xml action format if ($import) { - $numberOfRecords = isset($p['import']['number_of_records']) ? $p['import']['number_of_records'] : 1; - $decimalSeparator = isset($p['import']['decimal_separator']) ? $p['import']['decimal_separator'] : ' . '; + $numberOfRecords = $p['import']['number_of_records'] ?? 1; + $decimalSeparator = $p['import']['decimal_separator'] ?? ' . '; $parseFileXmlInter .= ' ' . $numberOfRecords . '' . $nl; $parseFileXmlInter .= ' _init('dataflow/batch', 'batch_id'); diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php index 3bc36a76f15..5d9fbea881c 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php index eae727e24c8..3bc3cd845e5 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..f982810b0c5 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Export.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..eed0a9d2ed8 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..a217888a493 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php index 658e22cf72b..3c2d7a0b24a 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php index 7c2157b4e7c..cdd66b96259 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Convert profile resource model * - * @category Mage - * @package Mage_Dataflow - * @author Magento Core Team + * @category Mage + * @package Mage_Dataflow + * @author Magento Core Team */ class Mage_Dataflow_Model_Resource_Profile 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/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php index 4fa2ab28926..52b970a936b 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..ba1f79fa545 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php index 140ea4fceab..b96c2f9c36f 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Session.php b/app/code/core/Mage/Dataflow/Model/Resource/Session.php index 50349ad5df7..728c51138b7 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Session.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bdd507a1bb1 100644 --- a/app/code/core/Mage/Dataflow/Model/Session.php +++ b/app/code/core/Mage/Dataflow/Model/Session.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +40,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/Model/Session/Adapter/Http.php b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php index 7e25b5f7cd0..9c10cd446c2 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,7 +46,7 @@ public function load() $uploader->save($path); if ($uploadFile = $uploader->getUploadedFileName()) { $session = Mage::getModel('dataflow/session'); - $session->setCreatedDate(date('Y-m-d H:i:s')); + $session->setCreatedDate(date(Varien_Date::DATETIME_PHP_FORMAT)); $session->setDirection('import'); $session->setUserId(Mage::getSingleton('admin/session')->getUser()->getId()); $session->save(); diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php index 08d59f9648d..7b95a0371ee 100644 --- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php +++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php index 89dd3cd0264..9ebf737c19e 100644 --- a/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/data/dataflow_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/etc/config.xml b/app/code/core/Mage/Dataflow/etc/config.xml index b18b37d8486..2322165e8a0 100644 --- a/app/code/core/Mage/Dataflow/etc/config.xml +++ b/app/code/core/Mage/Dataflow/etc/config.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_Dataflow - * @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_Dataflow + * @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/Dataflow/sql/dataflow_setup/install-1.6.0.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php index 54d6dfdb5b7..d3f4c0ddca0 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Dataflow - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php index 0d882e105f9..208c6465a1b 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php index 584452822c2..47bb86486c5 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,16 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + $this->startSetup()->run(" drop table if exists {$this->getTable('dataflow_profile')}; diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php index bb86927c23f..0ee3a51d72c 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,16 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + $this->startSetup()->run(" INSERT INTO `{$this->getTable('dataflow_profile')}` (`profile_id`, `name`, `created_at`, `updated_at`, `actions_xml`, `gui_data`, `direction`, `entity_type`, `store_id`, `data_transfer`) VALUES (NULL, 'Export All Products', NOW(), NOW(), '\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n true\r\n\r\n\r\n\r\n file\r\n var/export\r\n \r\n\r\n\r\n', 'a:5:{s:4:\"file\";a:7:{s:4:\"type\";s:4:\"file\";s:8:\"filename\";s:23:\"export_all_products.csv\";s:4:\"path\";s:10:\"var/export\";s:4:\"host\";s:0:\"\";s:4:\"user\";s:0:\"\";s:8:\"password\";s:0:\"\";s:7:\"passive\";s:0:\"\";}s:5:\"parse\";a:5:{s:4:\"type\";s:3:\"csv\";s:12:\"single_sheet\";s:0:\"\";s:9:\"delimiter\";s:1:\",\";s:7:\"enclose\";s:1:\"\"\";s:10:\"fieldnames\";s:4:\"true\";}s:3:\"map\";a:3:{s:14:\"only_specified\";s:0:\"\";s:7:\"product\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}s:8:\"customer\";a:2:{s:2:\"db\";a:0:{}s:4:\"file\";a:0:{}}}s:7:\"product\";a:1:{s:6:\"filter\";a:8:{s:4:\"name\";s:0:\"\";s:3:\"sku\";s:0:\"\";s:4:\"type\";s:1:\"0\";s:13:\"attribute_set\";s:0:\"\";s:5:\"price\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:3:\"qty\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}s:10:\"visibility\";s:1:\"0\";s:6:\"status\";s:1:\"0\";}}s:8:\"customer\";a:1:{s:6:\"filter\";a:10:{s:9:\"firstname\";s:0:\"\";s:8:\"lastname\";s:0:\"\";s:5:\"email\";s:0:\"\";s:5:\"group\";s:1:\"0\";s:10:\"adressType\";s:15:\"default_billing\";s:9:\"telephone\";s:0:\"\";s:8:\"postcode\";s:0:\"\";s:7:\"country\";s:0:\"\";s:6:\"region\";s:0:\"\";s:10:\"created_at\";a:2:{s:4:\"from\";s:0:\"\";s:2:\"to\";s:0:\"\";}}}}', 'export', 'product', 0, 'file'), diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php index da9fdc66862..ecf8925f48c 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,13 +24,13 @@ * * @category Mage * @package Mage_Dataflow - * @author Magento Core Team + * @author Magento Core Team */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('dataflow_batch_import')}`; diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php index d1ac5049109..613926e78a5 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('dataflow_batch'), 'params', 'text default NULL AFTER adapter'); $installer->endSetup(); diff --git a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index bf5fbd32c99..b6bb5852833 100644 --- a/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Dataflow/sql/dataflow_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Dataflow + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php index 1781a13c301..c89e99a0d8f 100644 --- a/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php +++ b/app/code/core/Mage/Directory/Block/Adminhtml/Frontend/Currency/Base.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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..e0d7e7a8a09 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Block/Currency.php b/app/code/core/Mage/Directory/Block/Currency.php index abaee263a73..23936d5daad 100644 --- a/app/code/core/Mage/Directory/Block/Currency.php +++ b/app/code/core/Mage/Directory/Block/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php index 6d723947b14..e50f4b9bed9 100644 --- a/app/code/core/Mage/Directory/Block/Data.php +++ b/app/code/core/Mage/Directory/Block/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Exception.php b/app/code/core/Mage/Directory/Exception.php index 7f39eae97b4..0e84b61f45f 100644 --- a/app/code/core/Mage/Directory/Exception.php +++ b/app/code/core/Mage/Directory/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index fb6076c0ce6..3c9facc3606 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,6 +43,8 @@ class Mage_Directory_Helper_Data extends Mage_Core_Helper_Abstract */ const XML_PATH_DISPLAY_ALL_STATES = 'general/region/display_all'; + protected $_moduleName = 'Mage_Directory'; + /** * Country collection * @@ -92,7 +95,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 = []) @@ -197,7 +199,6 @@ protected function _getRegions($storeId) /** @var Mage_Directory_Model_Region $regionModel */ $regionModel = $this->_factory->getModel('directory/region'); - /** @var Mage_Directory_Model_Resource_Region_Collection $collection */ $collection = $regionModel->getResourceCollection() ->addCountryFilter($countryIds) ->load(); @@ -266,7 +267,7 @@ public function getCountriesWithOptionalZip($asJson = false) * Check whether zip code is optional for specified country code * * @param string $countryCode - * @return boolean + * @return bool */ public function isZipCodeOptional($countryCode) { @@ -277,8 +278,8 @@ public function isZipCodeOptional($countryCode) /** * Returns the list of countries, for which region is required * - * @param boolean $asJson - * @return array + * @param bool $asJson + * @return array|string */ public function getCountriesWithStatesRequired($asJson = false) { @@ -296,7 +297,7 @@ public function getCountriesWithStatesRequired($asJson = false) */ public function getShowNonRequiredState() { - return (boolean)Mage::getStoreConfig(self::XML_PATH_DISPLAY_ALL_STATES); + return (bool)Mage::getStoreConfig(self::XML_PATH_DISPLAY_ALL_STATES); } /** diff --git a/app/code/core/Mage/Directory/Helper/Url.php b/app/code/core/Mage/Directory/Helper/Url.php index e3adf559761..a8ca111fcae 100644 --- a/app/code/core/Mage/Directory/Helper/Url.php +++ b/app/code/core/Mage/Directory/Helper/Url.php @@ -7,24 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { + protected $_moduleName = 'Mage_Directory'; + /** * Retrieve switch currency url * diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php index e8a1f07ee34..b04aaff51a9 100644 --- a/app/code/core/Mage/Directory/Model/Country.php +++ b/app/code/core/Mage/Directory/Model/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Country/Api.php b/app/code/core/Mage/Directory/Model/Country/Api.php index 50ca50da810..dbda4ff30da 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api.php +++ b/app/code/core/Mage/Directory/Model/Country/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..f7d32dbf4a5 100644 --- a/app/code/core/Mage/Directory/Model/Country/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Country/Api/V2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Directory/Model/Country/Format.php b/app/code/core/Mage/Directory/Model/Country/Format.php index 446b9612fdc..1d316763305 100644 --- a/app/code/core/Mage/Directory/Model/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Country/Format.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Directory/Model/Currency.php index 2ef5325223f..2f3dcadd628 100644 --- a/app/code/core/Mage/Directory/Model/Currency.php +++ b/app/code/core/Mage/Directory/Model/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -123,7 +124,7 @@ public function load($id, $field = null) * Get currency rate (only base=>allowed) * * @param string|Mage_Directory_Model_Currency $toCurrency - * @return string + * @return float|int * @throws Mage_Core_Exception */ public function getRate($toCurrency) diff --git a/app/code/core/Mage/Directory/Model/Currency/Filter.php b/app/code/core/Mage/Directory/Model/Currency/Filter.php index 6ab3d33c83d..ed3228d6280 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Filter.php +++ b/app/code/core/Mage/Directory/Model/Currency/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @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/Abstract.php b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php index 4bf0c4da111..610e8a39736 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Currencyconverterapi.php b/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php index 57b414895a4..0235c637982 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Currencyconverterapi.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Fixerio.php b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php index 1b7b3d6d9fe..f29569c965c 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Fixerio.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -212,9 +213,7 @@ protected function _validateResponse(array $response, $baseCurrency) ->__('One or more invalid symbols have been specified.'), ]; - $this->_messages[] = isset($errorCodes[$response['error']['code']]) - ? $errorCodes[$response['error']['code']] - : Mage::helper('directory')->__('Currency rates can\'t be retrieved.'); + $this->_messages[] = $errorCodes[$response['error']['code']] ?? Mage::helper('directory')->__('Currency rates can\'t be retrieved.'); return false; } 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..f5bccdf60bc 100644 --- a/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php +++ b/app/code/core/Mage/Directory/Model/Currency/Import/Webservicex.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,8 +24,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/Mysql4/Country.php b/app/code/core/Mage/Directory/Model/Mysql4/Country.php index 854f3c74ed8..393994e3b79 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php index 58f4cd3fa4d..66657b32986 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php index a7347dfa7ee..7512a583304 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php index a4946d1bdc8..7339c4bd2f1 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Country/Format/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php index 37bda025cba..2f5b29c47fe 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Currency.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php index e49be71d23b..c06c524ee54 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Currency/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region.php b/app/code/core/Mage/Directory/Model/Mysql4/Region.php index e0a83b57b36..68b0360f653 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Region.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Region.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @category Mage - * @package Mage_Directory - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team * @deprecated */ class Mage_Directory_Model_Mysql4_Region extends Mage_Directory_Model_Resource_Region diff --git a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php index dea3e86afef..0df36410f97 100644 --- a/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php +++ b/app/code/core/Mage/Directory/Model/Mysql4/Region/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/Model/Observer.php b/app/code/core/Mage/Directory/Model/Observer.php index a87e0ced228..7b1d2970354 100644 --- a/app/code/core/Mage/Directory/Model/Observer.php +++ b/app/code/core/Mage/Directory/Model/Observer.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory module observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team */ class Mage_Directory_Model_Observer { diff --git a/app/code/core/Mage/Directory/Model/Region.php b/app/code/core/Mage/Directory/Model/Region.php index b6e297a31bd..f0cb89cf5c0 100644 --- a/app/code/core/Mage/Directory/Model/Region.php +++ b/app/code/core/Mage/Directory/Model/Region.php @@ -7,19 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Region + * @category Mage + * @package Mage_Directory + * @author Magento Core Team * * @method Mage_Directory_Model_Resource_Region _getResource() * @method Mage_Directory_Model_Resource_Region getResource() @@ -33,10 +36,6 @@ * @method string getDefaultName() * @method $this setDefaultName(string $value) * @method int getRegionId() - * - * @category Mage - * @package Mage_Directory - * @author Magento Core Team */ class Mage_Directory_Model_Region extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Directory/Model/Region/Api.php b/app/code/core/Mage/Directory/Model/Region/Api.php index 5f79af04368..bbec7e61fbc 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api.php +++ b/app/code/core/Mage/Directory/Model/Region/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..9e9c998ae4a 100644 --- a/app/code/core/Mage/Directory/Model/Region/Api/V2.php +++ b/app/code/core/Mage/Directory/Model/Region/Api/V2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Directory/Model/Resource/Country.php index eabebb49244..05e3427e9d4 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Directory_Model_Resource_Country extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('directory/country', 'country_id'); 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..cafd99fd42e 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,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.php b/app/code/core/Mage/Directory/Model/Resource/Country/Format.php index d599775eaa1..cd69172eca5 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Country/Format.php +++ b/app/code/core/Mage/Directory/Model/Resource/Country/Format.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Directory_Model_Resource_Country_Format extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('directory/country_format', 'country_format_id'); 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..ec2b1bcc7ae 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Model/Resource/Currency.php b/app/code/core/Mage/Directory/Model/Resource/Currency.php index 2f3e704544a..d2c93bf3160 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Currency.php +++ b/app/code/core/Mage/Directory/Model/Resource/Currency.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +57,7 @@ protected function _construct() * * @param Mage_Directory_Model_Currency|string $currencyFrom * @param Mage_Directory_Model_Currency|string $currencyTo - * @return float + * @return float|int */ public function getRate($currencyFrom, $currencyTo) { diff --git a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php index cc646cdc3e4..7c56e8ae38f 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Region.php b/app/code/core/Mage/Directory/Model/Resource/Region.php index b3ed93b8bbb..00a0c7a1dba 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Region.php +++ b/app/code/core/Mage/Directory/Model/Resource/Region.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Directory Region Resource Model * - * @category Mage - * @package Mage_Directory - * @author Magento Core Team + * @category Mage + * @package Mage_Directory + * @author Magento Core Team */ class Mage_Directory_Model_Resource_Region extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php index 2242aee4947..0af7637f7ff 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Region/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/controllers/CurrencyController.php b/app/code/core/Mage/Directory/controllers/CurrencyController.php index d0b88ca4ce4..96fe9df77e9 100644 --- a/app/code/core/Mage/Directory/controllers/CurrencyController.php +++ b/app/code/core/Mage/Directory/controllers/CurrencyController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php index d1b8fe4334c..6deb7b9982e 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php index 7143f715644..43b80cd5242 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.0-1.6.0.1.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php index bf712827e01..13afcdd041a 100644 --- a/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Directory/data/directory_setup/data-upgrade-1.6.0.2-1.6.0.3.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/etc/api.xml b/app/code/core/Mage/Directory/etc/api.xml index c4e96c414a6..30af9791f50 100644 --- a/app/code/core/Mage/Directory/etc/api.xml +++ b/app/code/core/Mage/Directory/etc/api.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. (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/Directory/etc/config.xml b/app/code/core/Mage/Directory/etc/config.xml index d29581745cb..729af606b5c 100644 --- a/app/code/core/Mage/Directory/etc/config.xml +++ b/app/code/core/Mage/Directory/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..b4af94176db 100644 --- a/app/code/core/Mage/Directory/etc/system.xml +++ b/app/code/core/Mage/Directory/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> @@ -67,7 +68,7 @@ 1 1 1 - 1 + required-entry @@ -93,6 +94,9 @@ 1 0 0 + + 1 + @@ -102,6 +106,9 @@ 1 0 0 + + 1 + @@ -127,6 +134,9 @@ 1 0 0 + + 1 + @@ -136,6 +146,9 @@ 1 0 0 + + 1 + @@ -162,6 +175,9 @@ 1 1 1 + + 1 + @@ -171,6 +187,9 @@ 1 1 0 + + 1 + @@ -180,6 +199,9 @@ 1 1 0 + + 1 + @@ -189,6 +211,9 @@ 1 1 1 + + 1 + @@ -199,6 +224,9 @@ 1 1 1 + + 1 + diff --git a/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php b/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php index 4426cc7277b..ccc6214bd86 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php index 19b2f5ebdc6..022f4a15dde 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php index bf9d4646cf3..0d2856ed018 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-install-0.8.0.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Directory install - * * @category Mage * @package Mage_Directory - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ +/** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('directory_country')}`; CREATE TABLE `{$installer->getTable('directory_country')}` ( diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php index 04e650e6a2e..47fe3f7c956 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup() ->run(" DROP TABLE IF EXISTS {$this->getTable('directory_country_format')}; diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php index 8376e1ef9fe..7477542516b 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup() ->run(" @@ -29,4 +30,5 @@ 'Currency Update Warnings', NULL, NULL, '2008-01-30 14:10:31', '2008-01-30 16:02:47'); "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php index ad691835b7d..6b305182f18 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -7,27 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Directory upgrade - adding regions of France (#6068) - * * @category Mage * @package Mage_Directory - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; + /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" INSERT INTO `{$installer->getTable('directory_country_region')}` (`country_id`, `code`, `default_name`) VALUES @@ -64,4 +59,5 @@ ('FR', '90', 'Territoire-de-Belfort'),('FR', '91', 'Essonne'),('FR', '92', 'Hauts-de-Seine'), ('FR', '93', 'Seine-Saint-Denis'),('FR', '94', 'Val-de-Marne'),('FR', '95', 'Val-d\\'Oise'); "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php index 5daa744cedd..f63b178df43 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -7,29 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Directory upgrade - adding regions of France (#6068) - * * @category Mage * @package Mage_Directory - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; + /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" REPLACE INTO `{$installer->getTable('directory_country_region_name')}` (`locale`, `region_id`, `name`) SELECT 'en_US', `region_id`, `default_name` FROM `{$installer->getTable('directory_country_region')}` WHERE `country_id` = 'FR'; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php index 69604a9b8d2..5dd50a60364 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.10-0.8.11.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php index c5fbccc91ea..c542ddc115d 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php index 966e215c1ec..8e5d546ac4c 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php index e8ea41b7cc4..faf730a7a7c 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.4-0.8.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php index 02c8486c6fe..b6cab25aef4 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.5-0.8.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php index d6ecba0fa98..c17a963bbb4 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); // Delelte non-existent and unofficial iso-3166-1 codes diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php index 4af4a932b7f..7505c1049e9 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); //Entries for 'Newfoundland' should be corrected because of the province changed its name and code diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php index 83f8fe991f8..7a068f6f3d8 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ $installer = $this; -/** @var Varien_Db_Adapter_Pdo_Mysql */ +/** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection = $this->getConnection(); -$regionTable = $installer->getTable('directory/country_region'); +$regionTable = $installer->getTable('directory/country_region'); $regionsToIns = [ ['RO', 'AB', 'Alba'], ['RO', 'AR', 'Arad'], ['RO', 'AG', 'Argeş'], ['RO', 'BC', 'Bacău'], ['RO', 'BH', 'Bihor'], ['RO', 'BN', 'Bistriţa-Năsăud'], diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php index 8dea2bd3f50..c2be72c2c2f 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-0.8.9-0.8.10.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ $installer = $this; -/** @var Varien_Db_Adapter_Pdo_Mysql */ +/** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection = $this->getConnection(); + $regionTable = $installer->getTable('directory/country_region'); $regNameTable = $installer->getTable('directory/country_region_name'); diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 4d6fc93fdf4..6f8096e1880 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php index 479e47b00ea..5cb9ecd09e4 100644 --- a/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Directory/sql/directory_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Directory/sql/directory_setup/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..19d19d01184 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Directory + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php index 9ae6ba32855..ade6118e839 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php index 51e878c88ee..bc4ebe65474 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,7 +50,7 @@ public function __construct() /** * Check is readonly block * - * @return boolean + * @return bool */ public function isReadonly() { diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index e3586d5e75b..3112068f5f8 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml catalog product downloadable items tab links section * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * * @method $this setCanEditPrice(bool $value) * @method bool getCanReadPrice() @@ -40,7 +41,6 @@ class Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Li /** * Class constructor - * */ public function __construct() { @@ -148,8 +148,10 @@ public function getIsPriceWebsiteScope() public function getLinkData() { $linkArr = []; + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); /** @var Mage_Downloadable_Model_Link[] $links */ - $links = $this->getProduct()->getTypeInstance(true)->getLinks($this->getProduct()); + $links = $productType->getLinks($this->getProduct()); $priceWebsiteScope = Mage::helper('downloadable')->getIsPriceWebsiteScope(); foreach ($links as $item) { $tmpLinkItem = [ diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php index 042805303d7..78210968daa 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php @@ -7,29 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml catalog product downloadable items tab links section * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Block_Adminhtml_Catalog_Product_Edit_Tab_Downloadable_Samples extends Mage_Uploader_Block_Single { /** * Class constructor - * */ public function __construct() { @@ -50,7 +50,7 @@ public function getProduct() /** * Check block is readonly * - * @return boolean + * @return bool */ public function isReadonly() { @@ -81,8 +81,10 @@ public function getAddButtonHtml() public function getSampleData() { $samplesArr = []; + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); /** @var Mage_Downloadable_Model_Sample[] $samples */ - $samples = $this->getProduct()->getTypeInstance(true)->getSamples($this->getProduct()); + $samples = $productType->getSamples($this->getProduct()); foreach ($samples as $item) { $tmpSampleItem = [ 'sample_id' => $item->getId(), diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php index 934142d33c6..56d31b29ac3 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php index 7bc56f6a2d7..4a5190bc84a 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php @@ -7,28 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product Links 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_Links extends Mage_Catalog_Block_Product_Abstract { /** - * @return boolean + * @return bool */ public function getLinksPurchasedSeparately() { @@ -36,21 +37,23 @@ public function getLinksPurchasedSeparately() } /** - * @return boolean + * @return bool */ public function getLinkSelectionRequired() { - return $this->getProduct()->getTypeInstance(true) - ->getLinkSelectionRequired($this->getProduct()); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->getLinkSelectionRequired($this->getProduct()); } /** - * @return boolean + * @return bool */ public function hasLinks() { - return $this->getProduct()->getTypeInstance(true) - ->hasLinks($this->getProduct()); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->hasLinks($this->getProduct()); } /** @@ -58,8 +61,9 @@ public function hasLinks() */ public function getLinks() { - return $this->getProduct()->getTypeInstance(true) - ->getLinks($this->getProduct()); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->getLinks($this->getProduct()); } /** diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php index 487e0da4336..a897ab0d6ae 100644 --- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php +++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php @@ -7,45 +7,47 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product Samples 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_Samples extends Mage_Catalog_Block_Product_Abstract { - /** - * @return boolean + * @return bool */ public function hasSamples() { - return $this->getProduct()->getTypeInstance(true) - ->hasSamples($this->getProduct()); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->hasSamples($this->getProduct()); } /** * Get downloadable product samples * - * @return array + * @return Mage_Downloadable_Model_Resource_Sample_Collection */ public function getSamples() { - return $this->getProduct()->getTypeInstance(true) - ->getSamples($this->getProduct()); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $this->getProduct()->getTypeInstance(true); + return $productType->getSamples($this->getProduct()); } /** 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..96f0a6361d3 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 @@ -7,25 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Cart/Item/Renderer.php b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php index 55923bedd4b..768bde0df93 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Cart/Item/Renderer.php @@ -7,27 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart downloadable item render block * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Block_Checkout_Cart_Item_Renderer extends Mage_Checkout_Block_Cart_Item_Renderer { - /** * Retrieves item links options * diff --git a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php index 14fb2a9829f..dab3dc00576 100644 --- a/app/code/core/Mage/Downloadable/Block/Checkout/Success.php +++ b/app/code/core/Mage/Downloadable/Block/Checkout/Success.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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/Block/Customer/Products/List.php b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php index 74a5650086c..ef7356d8e61 100644 --- a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php +++ b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Block to display downloadable links bought by customer * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * * @method Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection getItems() * @method $this setItems(Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection $value) @@ -89,7 +90,7 @@ protected function _prepareLayout() /** * Return order view url * - * @param integer $orderId + * @param int $orderId * @return string */ public function getOrderViewUrl($orderId) @@ -112,7 +113,7 @@ public function getBackUrl() * Return number of left downloads or unlimited * * @param Mage_Downloadable_Model_Link_Purchased_Item $item - * @return string + * @return int|string */ public function getRemainingDownloads($item) { diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php index 268e3acac64..d076a58878c 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php index 1272cc63e65..3675854f3e5 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php index 026d19c0182..bee9c112f41 100644 --- a/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php index 05219f3b504..601a2cc0acf 100644 --- a/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php +++ b/app/code/core/Mage/Downloadable/Helper/Catalog/Product/Configuration.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Downloadable_Helper_Catalog_Product_Configuration extends Mage_Core_Helper_Abstract implements Mage_Catalog_Helper_Product_Configuration_Interface { + protected $_moduleName = 'Mage_Downloadable'; + /** * Retrieves item links options * @@ -39,8 +42,9 @@ public function getLinks(Mage_Catalog_Model_Product_Configuration_Item_Interface $itemLinks = []; $linkIds = $item->getOptionByCode('downloadable_link_ids'); if ($linkIds) { - $productLinks = $product->getTypeInstance(true) - ->getLinks($product); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + $productLinks = $productType->getLinks($product); foreach (explode(',', $linkIds->getValue()) as $linkId) { if (isset($productLinks[$linkId])) { $itemLinks[] = $productLinks[$linkId]; diff --git a/app/code/core/Mage/Downloadable/Helper/Data.php b/app/code/core/Mage/Downloadable/Helper/Data.php index d7bd66afdd5..e232890152b 100644 --- a/app/code/core/Mage/Downloadable/Helper/Data.php +++ b/app/code/core/Mage/Downloadable/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +27,8 @@ */ class Mage_Downloadable_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Downloadable'; + /** * Check is link shareable or not * diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php index 83a75c765a9..56316a7e80a 100644 --- a/app/code/core/Mage/Downloadable/Helper/Download.php +++ b/app/code/core/Mage/Downloadable/Helper/Download.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,6 +33,8 @@ class Mage_Downloadable_Helper_Download extends Mage_Core_Helper_Abstract const XML_PATH_CONTENT_DISPOSITION = 'catalog/downloadable/content_disposition'; + protected $_moduleName = 'Mage_Downloadable'; + /** * Type of link * @@ -115,10 +118,7 @@ protected function _getHandle() $port = (int)$urlProp['port']; } - $path = '/'; - if (isset($urlProp['path'])) { - $path = $urlProp['path']; - } + $path = $urlProp['path'] ?? '/'; $query = ''; if (isset($urlProp['query'])) { $query = '?' . $urlProp['query']; diff --git a/app/code/core/Mage/Downloadable/Helper/File.php b/app/code/core/Mage/Downloadable/Helper/File.php index b99829dc04a..d2890ebb204 100644 --- a/app/code/core/Mage/Downloadable/Helper/File.php +++ b/app/code/core/Mage/Downloadable/Helper/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Downloadable_Helper_File extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Downloadable'; + /** * @see Mage_Uploader_Helper_File::getMimeTypes * @var array diff --git a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php index b09f3ecf7ed..f93bc1f3149 100644 --- a/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php +++ b/app/code/core/Mage/Downloadable/Model/CatalogIndex/Data/Downloadable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Link.php b/app/code/core/Mage/Downloadable/Model/Link.php index 467eeaddae9..e6aba88e00f 100644 --- a/app/code/core/Mage/Downloadable/Model/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Link.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable link model * + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team + * * @method Mage_Downloadable_Model_Resource_Link _getResource() * @method Mage_Downloadable_Model_Resource_Link getResource() * @method Mage_Downloadable_Model_Resource_Link_Collection getCollection() @@ -62,10 +67,6 @@ * @method int getWebsiteId() * @method $this setWebsiteId(int $value) * @method float getWebsitePrice() - * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team */ class Mage_Downloadable_Model_Link extends Mage_Core_Model_Abstract { @@ -78,10 +79,6 @@ class Mage_Downloadable_Model_Link extends Mage_Core_Model_Abstract const LINK_SHAREABLE_NO = 0; const LINK_SHAREABLE_CONFIG = 2; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('downloadable/link'); diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api.php b/app/code/core/Mage/Downloadable/Model/Link/Api.php index a75588a1984..946112d2710 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -88,7 +89,7 @@ protected function _uploadFile($fileInfo, $type) * @param string $resourceType * @param string|int|null $store * @param string|null $identifierType ('sku'|'id') - * @return boolean + * @return bool */ public function add($productId, $resource, $resourceType, $store = null, $identifierType = null) { @@ -149,7 +150,9 @@ public function items($productId, $store = null, $identifierType = null) $product = $this->_getProduct($productId, $store, $identifierType); $linkArr = []; - $links = $product->getTypeInstance(true)->getLinks($product); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + $links = $productType->getLinks($product); $downloadHelper = Mage::helper('downloadable'); foreach ($links as $item) { $tmpLinkItem = [ @@ -212,7 +215,7 @@ public function items($productId, $store = null, $identifierType = null) unset($tmpLinkItem); unset($links); - $samples = $product->getTypeInstance(true)->getSamples($product)->getData(); + $samples = $productType->getSamples($product)->getData(); return ['links' => $linkArr, 'samples' => $samples]; } 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..14fe8742292 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -89,7 +90,7 @@ private function _decodeFile($fileInfo) return [ 'name' => $fileInfo['name'], - 'type' => isset($fileInfo['type'])? $fileInfo['type'] : self::DEFAULT_FILE_TYPE, + 'type' => $fileInfo['type'] ?? self::DEFAULT_FILE_TYPE, 'tmp_name' => $tmpFileName, 'error' => 0, 'size' => filesize($tmpFileName) 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..4b0ffdf2998 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bed7f892ceb 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Validator.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -84,7 +85,7 @@ public function getResourceTypes() * Validate resourceType, it should be one of (links|samples|link_samples) * * @param string $type - * @return boolean + * @return bool */ public function validateType($type) { @@ -213,7 +214,7 @@ public function validateNumOfDownloads(&$var) /** * Validate variable, in case of fault loads default entity. * - * @param int|boolean $var + * @param int|bool $var */ public function validateUnlimited(&$var) { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php index d0a532aa9d3..318b5ae296a 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable links purchased model * + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team + * * @method Mage_Downloadable_Model_Resource_Link_Purchased _getResource() * @method Mage_Downloadable_Model_Resource_Link_Purchased getResource() * @method int getOrderId() @@ -42,10 +47,6 @@ * @method string getLinkSectionTitle() * @method $this setLinkSectionTitle(string $value) * @method $this setPurchasedItems(Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection $value) - * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Purchased extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php index 62053e94dff..1410847d17b 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Purchased/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable links purchased item model * + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team + * * @method Mage_Downloadable_Model_Resource_Link_Purchased_Item _getResource() * @method Mage_Downloadable_Model_Resource_Link_Purchased_Item getResource() * @method Mage_Downloadable_Model_Resource_Link_Purchased_Item_Collection getCollection() @@ -56,10 +61,6 @@ * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) * @method Mage_Sales_Model_Order getOrder() - * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team */ class Mage_Downloadable_Model_Link_Purchased_Item extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php index 0a22032bb81..a17661b8e93 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable products Price indexer resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated */ class Mage_Downloadable_Model_Mysql4_Indexer_Price extends Mage_Downloadable_Model_Resource_Indexer_Price diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php index 1663e30eb0d..04782bd1bf5 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product Samples resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated */ class Mage_Downloadable_Model_Mysql4_Link extends Mage_Downloadable_Model_Resource_Link diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php index e417ddca6a0..85df22db2f8 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php index 321c988e148..0ba249b0363 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product link purchased resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated */ class Mage_Downloadable_Model_Mysql4_Link_Purchased extends Mage_Downloadable_Model_Resource_Link_Purchased diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php index 4b58f962abe..07cf88fa4f7 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php index d6c24bdf773..1228acf1fc4 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product link purchased items resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated */ class Mage_Downloadable_Model_Mysql4_Link_Purchased_Item extends Mage_Downloadable_Model_Resource_Link_Purchased_Item diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php index 1ea2d8db200..3b658fbd4e6 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Link/Purchased/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php index e90a12d760f..a9e3b8d02fd 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product Samples resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team * @deprecated */ class Mage_Downloadable_Model_Mysql4_Sample extends Mage_Downloadable_Model_Resource_Sample diff --git a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php index ca55d69b434..fc4deb3789d 100644 --- a/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Mysql4/Sample/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Observer.php b/app/code/core/Mage/Downloadable/Model/Observer.php index 712cbdf23e3..ba6175348ae 100644 --- a/app/code/core/Mage/Downloadable/Model/Observer.php +++ b/app/code/core/Mage/Downloadable/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Products Observer * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Observer { @@ -75,7 +76,9 @@ public function saveDownloadableOrderItem(Varien_Event_Observer $observer) ->load($orderItem->getProductId()); } if ($product->getTypeId() == Mage_Downloadable_Model_Product_Type::TYPE_DOWNLOADABLE) { - $links = $product->getTypeInstance(true)->getLinks($product); + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); + $links = $productType->getLinks($product); if ($linkIds = $orderItem->getProductOptionByCode('links')) { $linkPurchased = Mage::getModel('downloadable/link_purchased'); Mage::helper('core')->copyFieldset( diff --git a/app/code/core/Mage/Downloadable/Model/Product/Price.php b/app/code/core/Mage/Downloadable/Model/Product/Price.php index e1b2542f586..e500a6f8513 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Price.php @@ -7,30 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable products price model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Product_Price extends Mage_Catalog_Model_Product_Type_Price { /** * Retrieve product final price * - * @param integer|null $qty + * @param int|null $qty * @param Mage_Catalog_Model_Product $product * @return float */ @@ -48,9 +49,10 @@ public function getFinalPrice($qty, $product) if ($product->getLinksPurchasedSeparately()) { if ($linksIds = $product->getCustomOption('downloadable_link_ids')) { $linkPrice = 0; + /** @var Mage_Downloadable_Model_Product_Type $productType */ + $productType = $product->getTypeInstance(true); /** @var Mage_Downloadable_Model_Link[] $links */ - $links = $product->getTypeInstance(true) - ->getLinks($product); + $links = $productType->getLinks($product); foreach (explode(',', $linksIds->getValue()) as $linkId) { if (isset($links[$linkId])) { $linkPrice += $links[$linkId]->getPrice(); diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php index c7824b1f35c..34105ecf19c 100644 --- a/app/code/core/Mage/Downloadable/Model/Product/Type.php +++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -33,7 +34,7 @@ class Mage_Downloadable_Model_Product_Type extends Mage_Catalog_Model_Product_Ty * Get downloadable product links * * @param Mage_Catalog_Model_Product $product - * @return array + * @return Mage_Downloadable_Model_Link[] */ public function getLinks($product = null) { @@ -58,7 +59,7 @@ public function getLinks($product = null) * Check if product has links * * @param Mage_Catalog_Model_Product $product - * @return boolean + * @return bool */ public function hasLinks($product = null) { @@ -72,7 +73,7 @@ public function hasLinks($product = null) * Check if product has options * * @param Mage_Catalog_Model_Product $product - * @return boolean + * @return bool */ public function hasOptions($product = null) { @@ -99,7 +100,7 @@ public function hasRequiredOptions($product = null) * Check if product cannot be purchased with no links selected * * @param Mage_Catalog_Model_Product $product - * @return boolean + * @return bool */ public function getLinkSelectionRequired($product = null) { @@ -129,7 +130,7 @@ public function getSamples($product = null) * Check if product has samples * * @param Mage_Catalog_Model_Product $product - * @return boolean + * @return bool */ public function hasSamples($product = null) { @@ -383,6 +384,7 @@ public function getOrderOptions($product = null) * based on link can be purchased separately or not * * @param Mage_Catalog_Model_Product $product + * @return $this */ public function beforeSave($product = null) { @@ -408,6 +410,7 @@ public function beforeSave($product = null) $this->getProduct($product)->setTypeHasOptions($linksExist); $this->getProduct($product)->setLinksExist($linksExist); + return $this; } /** diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php b/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php index e2567f3ab53..bd80b50e855 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Indexer/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable products Price indexer resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Resource_Indexer_Price extends Mage_Catalog_Model_Resource_Product_Indexer_Price_Default { diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link.php b/app/code/core/Mage/Downloadable/Model/Resource/Link.php index 0606def202d..31f3fd6373f 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product Samples resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ 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/Link/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php index 8f3a4123311..e07904c7a2f 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +58,7 @@ public function addProductToFilter($product) /** * Retrieve title for for current store * - * @param integer $storeId + * @param int $storeId * @return $this */ public function addTitleToResult($storeId = 0) @@ -84,7 +85,7 @@ public function addTitleToResult($storeId = 0) /** * Retrieve price for for current website * - * @param integer $websiteId + * @param int $websiteId * @return $this */ public function addPriceToResult($websiteId) diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php index aa18f449040..59808fa3d92 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product link purchased resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Resource_Link_Purchased extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Varien class constructor - * - */ protected function _construct() { $this->_init('downloadable/link_purchased', 'purchased_id'); diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php index cb52200bd9c..4aa49ada85b 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php index e394f7cf18d..861cf0bf3e0 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product link purchased items resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_Resource_Link_Purchased_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Varien class constructor - * - */ protected function _construct() { $this->_init('downloadable/link_purchased_item', 'item_id'); diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php index cd95b55fad2..005e6f3a2b4 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Link/Purchased/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php index 81b596be5c8..5e57aee6a10 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Sample.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Product Samples resource model * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ 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/Model/Resource/Sample/Collection.php b/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php index 574ba09e9d4..ffc14ab0ab0 100644 --- a/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php +++ b/app/code/core/Mage/Downloadable/Model/Resource/Sample/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -57,7 +58,7 @@ public function addProductToFilter($product) /** * Add title column to select * - * @param integer $storeId + * @param int $storeId * @return $this */ public function addTitleToResult($storeId = 0) diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php index f2c877ef574..4483ecdc2c7 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php index e4bffe28aa8..f8c7b72481e 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,7 +107,7 @@ public function draw() ]; // draw options value - $_printValue = isset($option['print_value']) ? $option['print_value'] : strip_tags($option['value']); + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $lines[][] = [ 'text' => Mage::helper('core/string')->str_split($_printValue, 30, true, true), 'feed' => 40 diff --git a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php index 5628f21ab1b..29e7acb48ba 100644 --- a/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Downloadable/Model/Sales/Order/Pdf/Items/Invoice.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -117,11 +118,7 @@ public function draw() ]; if ($option['value']) { - if (isset($option['print_value'])) { - $_printValue = $option['print_value']; - } else { - $_printValue = strip_tags($option['value']); - } + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $values = explode(', ', $_printValue); foreach ($values as $value) { $lines[][] = [ diff --git a/app/code/core/Mage/Downloadable/Model/Sample.php b/app/code/core/Mage/Downloadable/Model/Sample.php index 8ff1bcf9a6e..df261609de9 100644 --- a/app/code/core/Mage/Downloadable/Model/Sample.php +++ b/app/code/core/Mage/Downloadable/Model/Sample.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable sample model * + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team + * * @method Mage_Downloadable_Model_Resource_Sample _getResource() * @method Mage_Downloadable_Model_Resource_Sample getResource() * @method Mage_Downloadable_Model_Resource_Sample_Collection getCollection() @@ -40,10 +45,6 @@ * @method string getStoreTitle() * @method string getTitle() * @method bool getUseDefaultTitle() - * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team */ class Mage_Downloadable_Model_Sample extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php index 7d0aa98d5e6..359bb3252c6 100644 --- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php +++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Contentdisposition.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php index 38484c18842..9f0655a63d9 100644 --- a/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php +++ b/app/code/core/Mage/Downloadable/Model/System/Config/Source/Orderitemstatus.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Downloadable Order Item Status Source * - * @category Mage - * @package Mage_Downloadable - * @author Magento Core Team + * @category Mage + * @package Mage_Downloadable + * @author Magento Core Team */ class Mage_Downloadable_Model_System_Config_Source_Orderitemstatus { diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php index d62b0cc8146..27af22b9ec6 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/FileController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php index 5acbef895dd..04dfaafbb0f 100644 --- a/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Adminhtml/Downloadable/Product/EditController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/CustomerController.php b/app/code/core/Mage/Downloadable/controllers/CustomerController.php index 2eae19a4721..fb048c0f077 100644 --- a/app/code/core/Mage/Downloadable/controllers/CustomerController.php +++ b/app/code/core/Mage/Downloadable/controllers/CustomerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -39,11 +40,11 @@ public function preDispatch() if (!Mage::getSingleton('customer/session')->authenticate($this, $loginUrl)) { $this->setFlag('', self::FLAG_NO_DISPATCH, true); } + return $this; } /** * Display downloadable links bought by customer - * */ public function productsAction() { diff --git a/app/code/core/Mage/Downloadable/controllers/DownloadController.php b/app/code/core/Mage/Downloadable/controllers/DownloadController.php index 93bc652046b..ee9ad5e056a 100644 --- a/app/code/core/Mage/Downloadable/controllers/DownloadController.php +++ b/app/code/core/Mage/Downloadable/controllers/DownloadController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/controllers/FileController.php b/app/code/core/Mage/Downloadable/controllers/FileController.php index df6cd82ecab..db88a3240a0 100644 --- a/app/code/core/Mage/Downloadable/controllers/FileController.php +++ b/app/code/core/Mage/Downloadable/controllers/FileController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,6 +34,8 @@ class Mage_Downloadable_FileController extends Mage_Downloadable_Adminhtml_Downl /** * Controller pre-dispatch method * Show 404 front page + * + * @return void */ public function preDispatch() { diff --git a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php index 43526221214..c90b5f591da 100644 --- a/app/code/core/Mage/Downloadable/controllers/Product/EditController.php +++ b/app/code/core/Mage/Downloadable/controllers/Product/EditController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,6 +34,8 @@ class Mage_Downloadable_Product_EditController extends Mage_Downloadable_Adminht /** * Controller pre-dispatch method * Show 404 front page + * + * @return void */ public function preDispatch() { diff --git a/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php index 4391c03b7a0..577b7d0dde8 100644 --- a/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/data/downloadable_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/etc/adminhtml.xml b/app/code/core/Mage/Downloadable/etc/adminhtml.xml index 9ee105b78e5..98eb53bb94b 100644 --- a/app/code/core/Mage/Downloadable/etc/adminhtml.xml +++ b/app/code/core/Mage/Downloadable/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 10fa45ae73c..358d34ccc24 100644 --- a/app/code/core/Mage/Downloadable/etc/api.xml +++ b/app/code/core/Mage/Downloadable/etc/api.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. (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/Downloadable/etc/config.xml b/app/code/core/Mage/Downloadable/etc/config.xml index 05d59ab65ed..f187b3f197b 100644 --- a/app/code/core/Mage/Downloadable/etc/config.xml +++ b/app/code/core/Mage/Downloadable/etc/config.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. (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/Downloadable/etc/system.xml b/app/code/core/Mage/Downloadable/etc/system.xml index a2b938cc2b1..0e7d746d1b1 100644 --- a/app/code/core/Mage/Downloadable/etc/system.xml +++ b/app/code/core/Mage/Downloadable/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php index 6f74071186b..97798b177e4 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php index fb9ae539501..aaaf3ba32eb 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-0.1.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $fieldList = [ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php index 513873442ea..e2ecc4fb421 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-install-1.4.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php index df02a042f45..d5c4c8ed608 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.0-0.1.1.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $this */ - +$installer = $this; $installer->startSetup(); + // make attribute 'weight' not applicable to downloadable products $applyTo = explode(',', $installer->getAttribute('catalog_product', 'weight', 'apply_to')); if (in_array('downloadable', $applyTo)) { diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php index 6589547d623..bf2decf61b3 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.1-0.1.2.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ +$installer = $this; +$installer->startSetup(); -$conn = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $conn */ - -$installer->startSetup(); +$conn = $installer->getConnection(); $installer->run(" CREATE TABLE `{$installer->getTable('downloadable/sample')}` ( diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php index 2f00a1e0e1a..61dfc23c1e4 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.10-0.1.11.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('downloadable/sample'), 'sample_type', "varchar(20) NOT NULL default '' AFTER `sample_file`"); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php index 4a83c47ef1a..6cd1129b121 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.11-0.1.12.php @@ -7,22 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); - $installer->getConnection()->addColumn($installer->getTable('downloadable/link_purchased_item'), 'product_id', "int(10) unsigned default '0' AFTER `order_item_id`"); - $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php index 66518c508a7..349ea410a8f 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.12-0.1.13.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('downloadable/link_purchased_item'), 'link_hash', "varchar(255) NOT NULL default '' AFTER `product_id`"); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php index 61cf1198be5..71cd97b5ff1 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.13-0.1.14.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('downloadable/link_purchased'), 'order_item_id', "int(10) unsigned NOT NULL default '0' AFTER `order_increment_id`"); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php index 3318ed70b35..515ca9e5cf3 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.14-0.1.15.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addKey( $installer->getTable('downloadable/link_title'), 'UNQ_LINK_TITLE_STORE', @@ -34,4 +35,5 @@ ['sample_id', 'store_id'], 'unique' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php index f700b8e1938..2724c1b6528 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.15-0.1.16.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'links_exist', [ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php index 64a6d649bed..aba618789fe 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.2-0.1.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'links_purchased_separately', [ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php index 7aba49ebfd9..ee11177706e 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.3-0.1.4.php @@ -7,22 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); - $installer->getConnection()->addColumn($installer->getTable('downloadable/sample'), 'sample_url', "varchar(255) NOT NULL default '' AFTER `product_id`"); - $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php index 9d7c5ec2c5f..d2b6509fd9d 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.4-0.1.5.php @@ -7,22 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); - $installer->getConnection()->addColumn($installer->getTable('downloadable/link'), 'link_url', "varchar(255) NOT NULL default '' AFTER `is_shareable`"); - $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php index 2bee14f8329..fb7efa70045 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.5-0.1.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php index 46b91a2967c..c49ecede0ed 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.6-0.1.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php index 8b6812944b8..6e8816ed030 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.7-0.1.8.php @@ -7,22 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); - $installer->getConnection()->addColumn($installer->getTable('downloadable/link_purchased'), 'is_shareable', "smallint(1) unsigned NOT NULL default '0' AFTER `link_title`"); - $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php index 9a5cb8a207e..c98702912cb 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.8-0.1.9.php @@ -7,22 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); - $installer->getConnection()->addColumn($installer->getTable('downloadable/link'), 'sample_url', "varchar(255) NOT NULL default '' AFTER `link_file`"); - $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php index ed795dc09d1..20d252b5a5d 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-0.1.9-0.1.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('catalog_product', 'samples_title', [ diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php index 34e73fe6999..9e84819af00 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.3.9-1.4.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); // Remove sales foreign keys diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index 0f51cbf5011..8f2800eea84 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS `{$installer->getTable('catalog/product_index_price')}_downloadable_idx`; @@ -44,4 +45,5 @@ ) ENGINE=MEMORY DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 0ab3fe4c395..ca616f988c6 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -7,17 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $installer->updateAttribute('catalog_product', 'links_purchased_separately', 'used_in_product_listing', 1); diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php index 3e8bad8cd4b..4ab509c058a 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Setup $installer */ $installer = $this; + $adapter = $installer->getConnection(); $adapter->modifyColumn( diff --git a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 45f2d0a3f8d..295551b02f2 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php index c4815d6fcff..e2fb96950eb 100644 --- a/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php +++ b/app/code/core/Mage/Downloadable/sql/downloadable_setup/mysql4-upgrade-1.6.0.0.1-1.6.0.0.2.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installFile = dirname(__FILE__) . DS . 'upgrade-1.6.0.0.1-1.6.0.0.2.php'; +$installFile = __DIR__ . DS . 'upgrade-1.6.0.0.1-1.6.0.0.2.php'; if (file_exists($installFile)) { include $installFile; } /** @var Mage_Catalog_Model_Resource_Setup $installer */ $installer = $this; + /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ $connection = $installer->getConnection(); + $connection->changeTableEngine( $installer->getTable('downloadable/product_price_indexer_tmp'), Varien_Db_Adapter_Pdo_Mysql::ENGINE_MEMORY 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..92065de32dd 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c6c397aca4b 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..43fdd6bac81 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Downloadable + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +29,5 @@ 'like' => 'catalog/downloadable/content_disposition' ]) ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php index 9df5d5c3115..5f5ad8103ff 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Js.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php index 7b7e7ae8d86..e44398f47d6 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Main/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,10 +45,7 @@ public function setAttributeObject($attribute) */ public function getAttributeObject() { - if ($this->_attribute === null) { - return Mage::registry('entity_attribute'); - } - return $this->_attribute; + return $this->_attribute ?? Mage::registry('entity_attribute'); } /** diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php index 938697ee2ec..4205faa6dee 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Edit/Options/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -185,7 +186,7 @@ public function getLabelValues() /** * Retrieve attribute option values for given store id * - * @param integer $storeId + * @param int $storeId * @return array */ public function getStoreOptionValues($storeId) diff --git a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php index d5de0b08045..41eea446b78 100644 --- a/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php +++ b/app/code/core/Mage/Eav/Block/Adminhtml/Attribute/Grid/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Exception.php b/app/code/core/Mage/Eav/Exception.php index 9dc187286d2..4335177004e 100644 --- a/app/code/core/Mage/Eav/Exception.php +++ b/app/code/core/Mage/Eav/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Helper/Data.php b/app/code/core/Mage/Eav/Helper/Data.php index 43f5b1bed3b..529cc4513d6 100644 --- a/app/code/core/Mage/Eav/Helper/Data.php +++ b/app/code/core/Mage/Eav/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,6 +33,8 @@ class Mage_Eav_Helper_Data extends Mage_Core_Helper_Abstract */ const XML_PATH_VALIDATOR_DATA_INPUT_TYPES = 'general/validator_data/input_types'; + protected $_moduleName = 'Mage_Eav'; + protected $_attributesLockedFields = []; protected $_entityTypeFrontendClasses = []; diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php index 94e1939f41c..d799c4722aa 100644 --- a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php +++ b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php b/app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php index 2af71f035b0..142aeaab1c5 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,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.php b/app/code/core/Mage/Eav/Model/Attribute.php index ed866a84fce..5a218d685a3 100644 --- a/app/code/core/Mage/Eav/Model/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -142,10 +143,7 @@ public function setValidateRules($rules) protected function _getScopeValue($key) { $scopeKey = sprintf('scope_%s', $key); - if ($this->getData($scopeKey) !== null) { - return $this->getData($scopeKey); - } - return $this->getData($key); + return $this->getData($scopeKey) ?? $this->getData($key); } /** diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data.php b/app/code/core/Mage/Eav/Model/Attribute/Data.php index c052ebc9db4..7bd3df8d49e 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Abstract.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php index 27d88c62804..adea91e8261 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -51,14 +52,14 @@ abstract class Mage_Eav_Model_Attribute_Data_Abstract /** * Scope visibility flag * - * @var boolean + * @var bool */ protected $_requestScopeOnly = true; /** * Is AJAX request flag * - * @var boolean + * @var bool */ protected $_isAjax = false; @@ -119,7 +120,7 @@ public function setRequestScope($scope) * Set scope visibility * Search value only in scope or search value in scope and global * - * @param boolean $flag + * @param bool $flag * @return Mage_Eav_Model_Attribute_Data_Abstract */ public function setRequestScopeOnly($flag) @@ -174,10 +175,7 @@ public function setExtractedData(array $data) public function getExtractedData($index = null) { if (!is_null($index)) { - if (isset($this->_extractedData[$index])) { - return $this->_extractedData[$index]; - } - return null; + return $this->_extractedData[$index] ?? null; } return $this->_extractedData; } @@ -186,7 +184,7 @@ public function getExtractedData($index = null) * Apply attribute input filter to value * * @param string $value - * @return string + * @return false|string */ protected function _applyInputFilter($value) { @@ -458,7 +456,7 @@ protected function _validateInputRule($value) /** * Set is AJAX Request flag * - * @param boolean $flag + * @param bool $flag * @return Mage_Eav_Model_Attribute_Data_Abstract */ public function setIsAjaxRequest($flag = true) @@ -470,7 +468,7 @@ public function setIsAjaxRequest($flag = true) /** * Return is AJAX Request * - * @return boolean + * @return bool */ public function getIsAjaxRequest() { @@ -491,21 +489,13 @@ protected function _getRequestValue(Zend_Controller_Request_Http $request) $params = $request->getParams(); $parts = explode('/', $this->_requestScope); foreach ($parts as $part) { - if (isset($params[$part])) { - $params = $params[$part]; - } else { - $params = []; - } + $params = $params[$part] ?? []; } } else { $params = $request->getParam($this->_requestScope); } - if (isset($params[$attrCode])) { - $value = $params[$attrCode]; - } else { - $value = false; - } + $value = $params[$attrCode] ?? false; if (!$this->_requestScopeOnly && $value === false) { $value = $request->getParam($attrCode, false); @@ -529,7 +519,7 @@ abstract public function extractValue(Zend_Controller_Request_Http $request); * * @param array|string $value * @throws Mage_Core_Exception - * @return boolean + * @return bool */ abstract public function validateValue($value); @@ -550,7 +540,7 @@ abstract public function compactValue($value); abstract public function restoreValue($value); /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php index 64b1906e997..9f7962f84e0 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php index 2f8c45df798..9086fa6259b 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +45,7 @@ public function extractValue(Zend_Controller_Request_Http $request) * Return true or array of errors * * @param array|string $value - * @return boolean|array + * @return bool|array */ public function validateValue($value) { @@ -120,7 +121,7 @@ public function restoreValue($value) } /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php index 0794f2d16e6..afc142144de 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Datetime.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php index 27a5c510ab7..6ea9f069ffe 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,7 +39,7 @@ class Mage_Eav_Model_Attribute_Data_File extends Mage_Eav_Model_Attribute_Data_A * Extract data from request and return value * * @param Zend_Controller_Request_Http $request - * @return array|string + * @return false|array|string */ public function extractValue(Zend_Controller_Request_Http $request) { @@ -258,7 +259,7 @@ public function restoreValue($value) } /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php index ac719dc3916..4e34fc10c5b 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Hidden.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php index f510bc106d7..89e3685349f 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Multiline.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php index a9c8808d445..12a6eea567b 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -49,7 +50,7 @@ public function extractValue(Zend_Controller_Request_Http $request) * Return true or array of errors * * @param array|string $value - * @return boolean|array + * @return bool|array */ public function validateValue($value) { @@ -118,7 +119,7 @@ public function restoreValue($value) } /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php index 1763873c7f2..2e3ac26a0f7 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -56,7 +57,7 @@ public function compactValue($value) } /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php index 88ee27e481f..44906149459 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -43,7 +44,7 @@ public function extractValue(Zend_Controller_Request_Http $request) * Return true or array of errors * * @param array|string $value - * @return boolean|array + * @return bool|array */ public function validateValue($value) { @@ -108,7 +109,7 @@ protected function _getOptionText($value) } /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array 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..6536a973a13 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Text.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -44,7 +45,7 @@ public function extractValue(Zend_Controller_Request_Http $request) * Return true or array of errors * * @param array|string $value - * @return boolean|array + * @return bool|array */ public function validateValue($value) { @@ -115,7 +116,7 @@ public function restoreValue($value) } /** - * Return formated attribute value from entity model + * Return formatted attribute value from entity model * * @param string $format * @return string|array 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..df9be81d30a 100644 --- a/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php +++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Textarea.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php index daa979cb4a3..ab0ba461726 100644 --- a/app/code/core/Mage/Eav/Model/Config.php +++ b/app/code/core/Mage/Eav/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -125,7 +126,7 @@ public function clear() */ protected function _load($id) { - return isset($this->_objects[$id]) ? $this->_objects[$id] : null; + return $this->_objects[$id] ?? null; } /** @@ -162,7 +163,7 @@ protected function _addEntityTypeReference($id, $code) */ protected function _getEntityTypeReference($id) { - return isset($this->_references['entity'][$id]) ? $this->_references['entity'][$id] : null; + return $this->_references['entity'][$id] ?? null; } /** @@ -188,10 +189,7 @@ protected function _addAttributeReference($id, $code, $entityTypeCode) */ protected function _getAttributeReference($id, $entityTypeCode) { - if (isset($this->_references['attribute'][$entityTypeCode][$id])) { - return $this->_references['attribute'][$entityTypeCode][$id]; - } - return null; + return $this->_references['attribute'][$entityTypeCode][$id] ?? null; } /** diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index c782dbc9fff..64a6f2ca616 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -95,11 +96,7 @@ public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joi foreach ($attrFilterArray as $key => $type) { if (is_array($type)) { - if (isset($type['bind'])) { - $bind = $type['bind']; - } else { - $bind = $defBind; - } + $bind = $type['bind'] ?? $defBind; $type = $type['type']; } @@ -112,7 +109,7 @@ public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joi } } - $keyDB = (isset($this->_attrToDb[$key])) ? $this->_attrToDb[$key] : $key; + $keyDB = $this->_attrToDb[$key] ?? $key; $exp = explode('/', $key); @@ -129,7 +126,7 @@ public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joi } $keyDB = str_replace('/', '_', $keyDB); } else { - $val = isset($filters[$key]) ? $filters[$key] : null; + $val = $filters[$key] ?? null; } if (is_null($val)) { continue; @@ -172,8 +169,8 @@ public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joi case 'datetimeFromTo': $attr = [ 'attribute' => $keyDB, - 'from' => isset($val['from']) ? $val['from'] : null, - 'to' => isset($val['to']) ? $val['to'] : null, + 'from' => $val['from'] ?? null, + 'to' => $val['to'] ?? null, 'datetime' => true ]; break; @@ -224,11 +221,11 @@ public function setJoinAttr($joinAttr) { if (is_array($joinAttr)) { $joinArrAttr = []; - $joinArrAttr['attribute'] = isset($joinAttr['attribute']) ? $joinAttr['attribute'] : null; + $joinArrAttr['attribute'] = $joinAttr['attribute'] ?? null; $joinArrAttr['alias'] = isset($joinAttr['attribute']) ? str_replace('/', '_', $joinAttr['attribute']):null; - $joinArrAttr['bind'] = isset($joinAttr['bind']) ? $joinAttr['bind'] : null; - $joinArrAttr['joinType'] = isset($joinAttr['joinType']) ? $joinAttr['joinType'] : null; - $joinArrAttr['storeId'] = isset($joinAttr['storeId']) ? $joinAttr['storeId'] : $this->getStoreId(); + $joinArrAttr['bind'] = $joinAttr['bind'] ?? null; + $joinArrAttr['joinType'] = $joinAttr['joinType'] ?? null; + $joinArrAttr['storeId'] = $joinAttr['storeId'] ?? $this->getStoreId(); $this->_joinAttr[] = $joinArrAttr; } } diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php index 109658a8349..912c12f9b90 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,6 +32,11 @@ class Mage_Eav_Model_Convert_Adapter_Grid extends Mage_Dataflow_Model_Convert_Ad { protected $_entity; + /** + * @var string + */ + protected $_entityType; + /** * @return Mage_Eav_Model_Entity_Interface */ diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php index 4cf45658af9..726150444c2 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +98,7 @@ public function getAttributeSetName($entityTypeId, $id) if (!$this->_attributeSetsById) { $this->loadAttributeSets($entityTypeId); } - return isset($this->_attributeSetsById[$id]) ? $this->_attributeSetsById[$id] : false; + return $this->_attributeSetsById[$id] ?? false; } /** @@ -110,7 +111,7 @@ public function getAttributeSetId($entityTypeId, $name) if (!$this->_attributeSetsByName) { $this->loadAttributeSets($entityTypeId); } - return isset($this->_attributeSetsByName[$name]) ? $this->_attributeSetsByName[$name] : false; + return $this->_attributeSetsByName[$name] ?? false; } /** diff --git a/app/code/core/Mage/Eav/Model/Entity.php b/app/code/core/Mage/Eav/Model/Entity.php index fa7d00d10b7..c90e55a09fa 100644 --- a/app/code/core/Mage/Eav/Model/Entity.php +++ b/app/code/core/Mage/Eav/Model/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,9 +38,6 @@ class Mage_Eav_Model_Entity extends Mage_Eav_Model_Entity_Abstract const DEFAULT_ENTITY_ID_FIELD = 'entity_id'; const DEFAULT_VALUE_TABLE_PREFIX= 'eav/entity_attribute'; - /** - * Resource initialization - */ public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php index 12a7d9afd2c..a496e167c2e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -127,14 +128,14 @@ abstract class Mage_Eav_Model_Entity_Abstract extends Mage_Core_Model_Resource_A /** * Partial load flag * - * @var boolean + * @var bool */ protected $_isPartialLoad = false; /** * Partial save flag * - * @var boolean + * @var bool */ protected $_isPartialSave = false; @@ -182,9 +183,6 @@ public function setConnection($read, $write = null) return $this; } - /** - * Resource initialization - */ protected function _construct() { } @@ -351,7 +349,7 @@ public function unsetAttributes($attributes = null) * * If attribute is not found false is returned * - * @param string|integer|Mage_Core_Model_Config_Element $attribute + * @param string|int|Mage_Core_Model_Config_Element $attribute * @return Mage_Eav_Model_Entity_Attribute_Abstract|Mage_Catalog_Model_Resource_Eav_Attribute|false */ public function getAttribute($attribute) @@ -465,8 +463,8 @@ public function addAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute /** * Retrieve partial load flag * - * @param boolean $flag - * @return boolean + * @param bool $flag + * @return bool */ public function isPartialLoad($flag = null) { @@ -480,8 +478,8 @@ public function isPartialLoad($flag = null) /** * Retrieve partial save flag * - * @param boolean $flag - * @return boolean + * @param bool $flag + * @return bool */ public function isPartialSave($flag = null) { @@ -583,7 +581,7 @@ public function attributesCompare($attribute1, $attribute2) * * @param Varien_Object $object * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute - * @return boolean + * @return bool */ protected function _isApplicableAttribute($object, $attribute) { @@ -665,7 +663,7 @@ public function walkAttributes($partMethod, array $args = []) * @param Mage_Eav_Model_Entity_Attribute_Abstract|Mage_Eav_Model_Entity_Attribute_Backend_Abstract|Mage_Eav_Model_Entity_Attribute_Frontend_Abstract|Mage_Eav_Model_Entity_Attribute_Source_Abstract $instance * @param string $method * @param array $args array of arguments - * @return boolean + * @return bool */ protected function _isCallableAttributeInstance($instance, $method, $args) { @@ -795,9 +793,9 @@ public function getEntityTablePrefix() * Check whether the attribute is a real field in entity table * * @see Mage_Eav_Model_Entity_Abstract::getAttribute for $attribute format - * @param integer|string|Mage_Eav_Model_Entity_Attribute_Abstract $attribute + * @param int|string|Mage_Eav_Model_Entity_Attribute_Abstract $attribute * - * @return boolean + * @return bool */ public function isAttributeStatic($attribute) { @@ -857,7 +855,7 @@ public function setNewIncrementId(Varien_Object $object) * * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param Varien_Object $object - * @return boolean + * @return bool */ public function checkAttributeUniqueValue(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $object) { @@ -917,7 +915,7 @@ public function getDefaultAttributeSourceModel() * Load entity's attributes into the object * * @param Mage_Core_Model_Abstract $object - * @param integer $entityId + * @param int $entityId * @param array|null $attributes * @return Mage_Eav_Model_Entity_Abstract */ @@ -982,7 +980,12 @@ protected function _loadModelAttributes($object) $selectGroups = $helper->getLoadAttributesSelectGroups($selects); foreach ($selectGroups as $selects) { if (!empty($selects)) { - $select = $this->_prepareLoadSelect($selects); + if (is_array($selects)) { + $select = $this->_prepareLoadSelect($selects); + } else { + $select = $selects; + } + $values = $this->_getReadAdapter()->fetchAll($select); foreach ($values as $valueRow) { $this->_setAttributeValue($object, $valueRow); @@ -1240,11 +1243,7 @@ protected function _getStaticFieldProperties($field) ->describeTable($this->getEntityTable()); } - if (isset($this->_describeTable[$this->getEntityTable()][$field])) { - return $this->_describeTable[$this->getEntityTable()][$field]; - } - - return false; + return $this->_describeTable[$this->getEntityTable()][$field] ?? false; } /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php index 2a88e182560..375c0e34b4b 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php index c8a62e62f63..a4f0b298fa2 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,13 +115,10 @@ abstract class Mage_Eav_Model_Entity_Attribute_Abstract extends Mage_Core_Model_ /** * Attribute validation flag * - * @var boolean + * @var bool */ protected $_attributeValidationPassed = false; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('eav/entity_attribute'); @@ -346,7 +344,7 @@ public function setEntityType($type) * Return is attribute global * * @deprecated moved to catalog attribute model - * @return integer + * @return int */ public function getIsGlobal() { @@ -542,7 +540,7 @@ public function isValueEmpty($value) /** * Check if attribute is valid * - * @return boolean + * @return bool */ public function isAttributeValidationPassed() { @@ -553,7 +551,7 @@ public function isAttributeValidationPassed() * Check if attribute in specified set * * @param int|array $setId - * @return boolean + * @return bool */ public function isInSet($setId) { @@ -579,7 +577,7 @@ public function isInSet($setId) * * @param int $setId * @param int $groupId - * @return boolean + * @return bool */ public function isInGroup($setId, $groupId) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php index e3e39b55281..243c241a5d4 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +38,7 @@ abstract class Mage_Eav_Model_Entity_Attribute_Backend_Abstract implements Mage_ /** * PK value_id for loaded entity (for faster updates) * - * @var integer + * @var int */ protected $_valueId; @@ -104,7 +105,7 @@ public function getType() /** * Check whether the attribute is a real field in the entity table * - * @return boolean + * @return bool */ public function isStatic() { @@ -228,7 +229,7 @@ public function getDefaultValue() * * @param Varien_Object $object * @throws Mage_Eav_Exception - * @return boolean + * @return bool */ public function validate($object) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php index e25454bc3b9..33075ecb11d 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Array.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php index df68c96bf19..03f7259c4f4 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -63,8 +64,8 @@ public function beforeSave($object) * string format used from input fields (all date input fields need apply locale settings) * int value can be declared in code (this meen whot we use valid date) * - * @param string | int $date - * @return string + * @param string|int $date + * @return string|null */ public function formatDate($date) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php index e6e09c02b49..66d354153f4 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Default.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Increment.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php index b354f13ddb6..55221e555c3 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Increment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @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/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php index 5c51d1eb012..56022871b7f 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Serialized.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php index 65760ec4b84..76336d4b6ef 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Serialized.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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..718613d7a37 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php index b68c0910954..a72ade2cc5e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Time/Created.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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..68abcf6efeb 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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/Exception.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php index e50df684f03..c1c2dacafdd 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php index 2fc5b712f8a..bd6c04c12f5 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -117,7 +118,7 @@ public function getValue(Varien_Object $object) /** * Checks if attribute is visible on frontend * - * @return boolean + * @return bool */ public function isVisible() { @@ -222,7 +223,7 @@ public function getOption($optionId) /** * Retrieve Input Renderer Class * - * @return string + * @return string|null */ public function getInputRendererClass() { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php index ede3f61e13a..e848de63efb 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Datetime.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php index 9fd2416a5b2..0873461aeef 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php index 29bfa2e4eea..785d44955be 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,5 +30,4 @@ */ interface Mage_Eav_Model_Entity_Attribute_Frontend_Interface { - } diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php index 18e36cd470d..e3716736e5e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,9 +42,6 @@ */ class Mage_Eav_Model_Entity_Attribute_Group extends Mage_Core_Model_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_attribute_group'); @@ -52,7 +50,7 @@ protected function _construct() /** * Checks if current attribute group exists * - * @return boolean + * @return bool */ public function itemExists() { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php index 3f587d3ab4e..86071ae261c 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Option.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php index 51cf5cdf208..561acad7f52 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Option.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +37,6 @@ */ class Mage_Eav_Model_Entity_Attribute_Option extends Mage_Core_Model_Abstract { - /** - * Resource initialization - */ public function _construct() { $this->_init('eav/entity_attribute_option'); 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..09e2768a2db 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -52,10 +53,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/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php index ad21db26ce1..5908c7cbdc6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,14 +77,11 @@ public function getOptionText($value) if (count($options)) { foreach ($options as $option) { if (isset($option['value']) && $option['value'] == $value) { - return isset($option['label']) ? $option['label'] : $option['value']; + return $option['label'] ?? $option['value']; } } // End } - if (isset($options[$value])) { - return $options[$value]; - } - return false; + return $options[$value] ?? false; } /** diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php index 8ce377634ee..73c5b0eb9c4 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -80,8 +81,8 @@ public function toOptionArray() /** * Get a text for option value * - * @param string|integer $value - * @return string + * @param string|int $value + * @return string|false */ public function getOptionText($value) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php index fcf07e5583c..7cc6fe744f1 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php index 85741677cb7..f6266ff888e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Store.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Store.php index a8583f8bfa3..d05486bd23e 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) + * @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..0fbb8a2ad70 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -74,7 +75,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false) /** * Get a text for option value * - * @param string|integer $value + * @param string|int $value * @return string|array|false */ public function getOptionText($value) diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection.php b/app/code/core/Mage/Eav/Model/Entity/Collection.php index beb859eda34..da343b70dd5 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php index 3002aa8ecf3..e041b7fb857 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -160,9 +161,11 @@ protected function _prepareStaticFields() protected function _initSelect() { $this->getSelect()->from(['e' => $this->getEntity()->getEntityTable()]); - if ($this->getEntity()->getTypeId()) { + + if ($this->getEntity()->getEntityTable() === Mage_Eav_Model_Entity::DEFAULT_ENTITY_TABLE && $this->getEntity()->getTypeId()) { $this->addAttributeToFilter('entity_type_id', $this->getEntity()->getTypeId()); } + return $this; } @@ -630,11 +633,7 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy $entity = $attribute->getEntity(); } elseif (is_string($entity)) { // retrieve cached entity if possible - if (isset($this->_joinEntities[$entity])) { - $entity = $this->_joinEntities[$entity]; - } else { - $entity = Mage::getModel('eav/entity')->setType($attrArr[0]); - } + $entity = $this->_joinEntities[$entity] ?? Mage::getModel('eav/entity')->setType($attrArr[0]); } if (!$entity || !$entity->getTypeId()) { throw Mage::exception('Mage_Eav', Mage::helper('eav')->__('Invalid entity type')); @@ -840,8 +839,8 @@ public function removeAttributeToSelect($attribute = null) /** * Set collection page start and records to show * - * @param integer $pageNum - * @param integer $pageSize + * @param int $pageNum + * @param int $pageSize * @return $this */ public function setPage($pageNum, $pageSize) @@ -1124,7 +1123,12 @@ public function _loadAttributes($printQuery = false, $logQuery = false) foreach ($selectGroups as $selects) { if (!empty($selects)) { try { - $select = implode(' UNION ALL ', $selects); + if (is_array($selects)) { + $select = implode(' UNION ALL ', $selects); + } else { + $select = $selects; + } + $values = $this->getConnection()->fetchAll($select); } catch (Exception $e) { Mage::printException($e, $select); @@ -1404,12 +1408,7 @@ protected function _getAttributeConditionSql($attribute, $condition, $joinType = ); } else { $this->_addAttributeJoin($attribute, $joinType); - if (isset($this->_joinAttributes[$attribute]['condition_alias'])) { - $field = $this->_joinAttributes[$attribute]['condition_alias']; - } else { - $field = $this->_getAttributeTableAlias($attribute) . '.value'; - } - + $field = $this->_joinAttributes[$attribute]['condition_alias'] ?? ($this->_getAttributeTableAlias($attribute) . '.value'); $conditionSql = $this->_getConditionSql($field, $condition); } diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php index 69544b6a84e..3947b627c61 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,12 +24,6 @@ * @package Mage_Eav * @author Magento Core Team * - * Properties: - * - prefix - * - pad_length - * - pad_char - * - last_id - * * @method string getLastId() * @method string getPrefix() */ diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php index eb2c735d8f0..34ccf726b37 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,12 +23,6 @@ * @category Mage * @package Mage_Eav * @author Magento Core Team - * - * Properties: - * - prefix - * - pad_length - * - pad_char - * - last_id */ class Mage_Eav_Model_Entity_Increment_Alphanum extends Mage_Eav_Model_Entity_Increment_Abstract { @@ -47,7 +42,7 @@ public function getNextId() { $lastId = $this->getLastId(); - if (strpos($lastId, $this->getPrefix())===0) { + if (strpos($lastId, $this->getPrefix()) === 0) { $lastId = substr($lastId, strlen($this->getPrefix())); } diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php index ab3ee8083bb..953da05a603 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Increment/Numeric.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php index f614ca5dce9..5ee40e29b65 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php +++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php @@ -7,27 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * @category Mage * @package Mage_Eav * @author Magento Core Team - * - * Properties: - * - prefix - * - pad_length - * - pad_char - * - last_id */ class Mage_Eav_Model_Entity_Increment_Numeric extends Mage_Eav_Model_Entity_Increment_Abstract { @@ -40,7 +35,7 @@ public function getNextId() if (empty($last)) { $last = 0; - } else if (!empty($prefix = (string)$this->getPrefix()) && strpos($last, $prefix) === 0) { + } elseif (!empty($prefix = (string)$this->getPrefix()) && strpos($last, $prefix) === 0) { $last = (int)substr($last, strlen($prefix)); } else { $last = (int)$last; diff --git a/app/code/core/Mage/Eav/Model/Entity/Interface.php b/app/code/core/Mage/Eav/Model/Entity/Interface.php index 89f31e5836e..74db28cdd10 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Interface.php +++ b/app/code/core/Mage/Eav/Model/Entity/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2575d7c09db 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Setup.php +++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -613,7 +614,7 @@ protected function _getValue($array, $key, $default = null) if (isset($array[$key]) && is_bool($array[$key])) { $array[$key] = (int) $array[$key]; } - return isset($array[$key]) ? $array[$key] : $default; + return $array[$key] ?? $default; } /** @@ -669,7 +670,7 @@ protected function _validateAttributeData($data) * * If attribute is system will add to all existing attribute sets * - * @param string|integer $entityTypeId + * @param string|int $entityTypeId * @param string $code * @param array $attr * @return $this @@ -687,7 +688,7 @@ public function addAttribute($entityTypeId, $code, array $attr) $this->_validateAttributeData($data); - $sortOrder = isset($attr['sort_order']) ? $attr['sort_order'] : null; + $sortOrder = $attr['sort_order'] ?? null; $attributeId = $this->getAttribute($entityTypeId, $code, 'attribute_id'); if ($attributeId) { $this->updateAttribute($entityTypeId, $attributeId, $data, null, $sortOrder); @@ -759,13 +760,13 @@ public function addAttributeOption($option) if (!$intOptionId) { $data = [ 'attribute_id' => $option['attribute_id'], - 'sort_order' => isset($option['order'][$optionId]) ? $option['order'][$optionId] : 0, + 'sort_order' => $option['order'][$optionId] ?? 0, ]; $this->_conn->insert($optionTable, $data); $intOptionId = $this->_conn->lastInsertId($optionTable); } else { $data = [ - 'sort_order' => isset($option['order'][$optionId]) ? $option['order'][$optionId] : 0, + 'sort_order' => $option['order'][$optionId] ?? 0, ]; $this->_conn->update($optionTable, $data, ['option_id=?' => $intOptionId]); } @@ -965,7 +966,7 @@ public function getAttribute($entityTypeId, $id, $field = null) $row = $this->_setupCache[$mainTable][$entityTypeId][$id]; if ($field !== null) { - return isset($row[$field]) ? $row[$field] : false; + return $row[$field] ?? false; } return $row; @@ -976,7 +977,7 @@ public function getAttribute($entityTypeId, $id, $field = null) * * @param mixed $entityTypeId * @param mixed $id - * @return int + * @return false|int */ public function getAttributeId($entityTypeId, $id) { @@ -994,7 +995,7 @@ public function getAttributeId($entityTypeId, $id) * * @param int|string $entityTypeId Entity Type id or Entity Type code * @param int|string $id Attribute id or Attribute code - * @return string + * @return string|false */ public function getAttributeTable($entityTypeId, $id) { @@ -1206,9 +1207,9 @@ public function installEntities($entities = null) foreach ($entities as $entityName => $entity) { $this->addEntityType($entityName, $entity); - $frontendPrefix = isset($entity['frontend_prefix']) ? $entity['frontend_prefix'] : ''; - $backendPrefix = isset($entity['backend_prefix']) ? $entity['backend_prefix'] : ''; - $sourcePrefix = isset($entity['source_prefix']) ? $entity['source_prefix'] : ''; + $frontendPrefix = $entity['frontend_prefix'] ?? ''; + $backendPrefix = $entity['backend_prefix'] ?? ''; + $sourcePrefix = $entity['source_prefix'] ?? ''; foreach ($entity['attributes'] as $attrCode => $attr) { if (!empty($attr['backend'])) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Store.php b/app/code/core/Mage/Eav/Model/Entity/Store.php index 4205f04c82f..d8937d5337c 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Entity/Store.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -36,9 +37,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..256406e0896 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Entity/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -77,9 +78,6 @@ class Mage_Eav_Model_Entity_Type extends Mage_Core_Model_Abstract */ protected $_sets; - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type'); @@ -158,7 +156,7 @@ public function getAttributeSetCollection() * Retrieve new incrementId * * @param int $storeId - * @return string + * @return false|string * @throws Exception */ public function fetchNewIncrementId($storeId = null) @@ -239,7 +237,7 @@ public function getEntityTable() /** * Retrieve entity table prefix name * - * @return string + * @return string|null */ public function getValueTablePrefix() { diff --git a/app/code/core/Mage/Eav/Model/Form.php b/app/code/core/Mage/Eav/Model/Form.php index c1cae2a3f46..cfc6b3e0d7e 100644 --- a/app/code/core/Mage/Eav/Model/Form.php +++ b/app/code/core/Mage/Eav/Model/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,7 +94,7 @@ abstract class Mage_Eav_Model_Form /** * Is AJAX request flag * - * @var boolean + * @var bool */ protected $_isAjax = false; @@ -344,7 +345,7 @@ public function prepareRequest(array $data) * * @param Zend_Controller_Request_Http $request * @param string $scope the request scope - * @param boolean $scopeOnly search value only in scope or search value in global too + * @param bool $scopeOnly search value only in scope or search value in global too * @return array */ public function extractData(Zend_Controller_Request_Http $request, $scope = null, $scopeOnly = true) @@ -366,7 +367,7 @@ public function extractData(Zend_Controller_Request_Http $request, $scope = null * Validate data array and return true or array of errors * * @param array $data - * @return boolean|array + * @return bool|array */ public function validateData(array $data) { @@ -439,7 +440,7 @@ public function restoreData(array $data) } /** - * Return array of entity formated values + * Return array of entity formatted values * * @param string $format * @return array @@ -478,7 +479,7 @@ public function resetEntityData() /** * Set is AJAX Request flag * - * @param boolean $flag + * @param bool $flag * @return Mage_Eav_Model_Form */ public function setIsAjaxRequest($flag = true) @@ -490,7 +491,7 @@ public function setIsAjaxRequest($flag = true) /** * Return is AJAX Request * - * @return boolean + * @return bool */ public function getIsAjaxRequest() { diff --git a/app/code/core/Mage/Eav/Model/Form/Element.php b/app/code/core/Mage/Eav/Model/Form/Element.php index 7141c29e9cc..1532328ae5c 100644 --- a/app/code/core/Mage/Eav/Model/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Form/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,9 +48,6 @@ class Mage_Eav_Model_Form_Element extends Mage_Core_Model_Abstract */ protected $_eventPrefix = 'eav_form_element'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('eav/form_element'); diff --git a/app/code/core/Mage/Eav/Model/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Form/Fieldset.php index 4db8e076c7c..b90d3437d2f 100644 --- a/app/code/core/Mage/Eav/Model/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Form/Fieldset.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,9 +48,6 @@ class Mage_Eav_Model_Form_Fieldset extends Mage_Core_Model_Abstract */ protected $_eventPrefix = 'eav_form_fieldset'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('eav/form_fieldset'); diff --git a/app/code/core/Mage/Eav/Model/Form/Type.php b/app/code/core/Mage/Eav/Model/Form/Type.php index f8b3f21c67f..341e5f44161 100644 --- a/app/code/core/Mage/Eav/Model/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Form/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Config.php b/app/code/core/Mage/Eav/Model/Mysql4/Config.php index fe74ae8929c..1f68423de2a 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Config.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php index 01659998007..89f14116aec 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php index 4bb9ebcc48c..4950a5eb8e1 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php index 007ce16fcfe..b4f2611398f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php index 16aecdcde7c..14cc76fb18b 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Group/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Option.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php index f71172abdbd..a90582383b6 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Option/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php index afd0d2ff7d0..56d0fdf572f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..9210e81b7d4 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php index 2f8c75cbe26..4379f25375f 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Attribute/Set/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..0d2d242d212 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Store.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..f470a2da0b6 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php index 0bb239e12b0..cadb9d7035b 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Entity/Type/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php index 5660bfaba5c..678e2c3e899 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php index 1cb40bb373c..7d48c862dc5 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Element/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php index b6a17a77e78..d403257f67b 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php index 0f2e1b00ea6..48df48f992a 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Fieldset/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..e990a886d14 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php index 5bc79ba49fd..5d9cdb60e2a 100644 --- a/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Mysql4/Form/Type/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Attribute.php index 59dbc8d1990..65caa112cb6 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php index 3aab5f3ebc4..08d5b60439a 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Config.php b/app/code/core/Mage/Eav/Model/Resource/Config.php index e855114189b..e6dd9abce0b 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Config.php +++ b/app/code/core/Mage/Eav/Model/Resource/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,9 +42,6 @@ class Mage_Eav_Model_Resource_Config extends Mage_Core_Model_Resource_Db_Abstrac */ protected static $_attributes = []; - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type', 'entity_type_id'); @@ -104,11 +102,9 @@ public function fetchEntityTypeData($entityType) $this->_loadTypes(); if (is_numeric($entityType)) { - $info = isset(self::$_entityTypes['by_id'][$entityType]) - ? self::$_entityTypes['by_id'][$entityType] : null; + $info = self::$_entityTypes['by_id'][$entityType] ?? null; } else { - $info = isset(self::$_entityTypes['by_code'][$entityType]) - ? self::$_entityTypes['by_code'][$entityType] : null; + $info = self::$_entityTypes['by_code'][$entityType] ?? null; } $data = []; 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..350434f172f 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,18 +35,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() @@ -87,7 +82,7 @@ protected function _loadTypeAttributes($entityTypeId) * @param Mage_Core_Model_Abstract $object * @param int $entityTypeId * @param string $code - * @return boolean + * @return bool */ public function loadByCode(Mage_Core_Model_Abstract $object, $entityTypeId, $code) { @@ -180,7 +175,7 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object) /** * Save additional attribute data after save attribute * - * @param Mage_Eav_Model_Entity_Attribute|Mage_Eav_Model_Entity_Attribute $object + * @param Mage_Eav_Model_Entity_Attribute $object * @inheritDoc */ protected function _afterSave(Mage_Core_Model_Abstract $object) @@ -475,7 +470,7 @@ public function describeTable($table) /** * Retrieve additional attribute table name for specified entity type * - * @param integer $entityTypeId + * @param int $entityTypeId * @return string */ public function getAdditionalAttributeTable($entityTypeId) @@ -519,7 +514,7 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object) /** * Retrieve store labels by given attribute id * - * @param integer $attributeId + * @param int $attributeId * @return array */ public function getStoreLabelsByAttributeId($attributeId) diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php index b2b4aabcd03..df60f2bedb0 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,7 +37,7 @@ class Mage_Eav_Model_Resource_Entity_Attribute_Collection extends Mage_Core_Mode /** * Add attribute set info flag * - * @var boolean + * @var bool */ protected $_addSetInfoFlag = false; @@ -358,11 +359,7 @@ protected function _addSetInfo() } foreach ($this->_data as &$attributeData) { - $setInfo = []; - if (isset($attributeToSetInfo[$attributeData['attribute_id']])) { - $setInfo = $attributeToSetInfo[$attributeData['attribute_id']]; - } - + $setInfo = $attributeToSetInfo[$attributeData['attribute_id']] ?? []; $attributeData['attribute_set_info'] = $setInfo; } diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php index 4306f93019b..7d4834ec763 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Eav_Model_Resource_Entity_Attribute_Group extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/attribute_group', 'attribute_group_id'); @@ -39,7 +37,7 @@ protected function _construct() * Checks if attribute group exists * * @param Mage_Eav_Model_Entity_Attribute_Group $object - * @return boolean + * @return bool */ public function itemExists($object) { @@ -108,7 +106,7 @@ protected function _getMaxSortOrder($object) /** * Set any group default if old one was removed * - * @param integer $attributeSetId + * @param int $attributeSetId * @return $this */ public function updateDefaultGroup($attributeSetId) diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php index 724fcd52648..2c79f876600 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Option.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php index f1d1144e139..7b0e35f28c0 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,6 @@ */ class Mage_Eav_Model_Resource_Entity_Attribute_Option extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/attribute_option', 'option_id'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php index a86bd70c538..92826becaaf 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,9 +35,6 @@ class Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection extends Mage_Co */ protected $_optionValueTable; - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_attribute_option'); @@ -128,7 +126,7 @@ public function toOptionArray($valueKey = 'value') * Set order by position or alphabetically by values in admin * * @param string $dir direction - * @param boolean $sortAlpha sort alphabetically by values in admin + * @param bool $sortAlpha sort alphabetically by values in admin * @return $this */ public function setPositionOrder($dir = self::SORT_ORDER_ASC, $sortAlpha = false) 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..ec5861eec03 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,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'); @@ -139,9 +136,7 @@ public function getSetInfo(array $attributeIds, $setId = null) } foreach ($attributeIds as $atttibuteId) { - $setInfo[$atttibuteId] = isset($attributeToSetInfo[$atttibuteId]) - ? $attributeToSetInfo[$atttibuteId] - : []; + $setInfo[$atttibuteId] = $attributeToSetInfo[$atttibuteId] ?? []; } return $setInfo; diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php index a6eec08d8cb..55f8b65c12a 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('eav/entity_attribute_set'); 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..a37e7e8ff54 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Store.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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'); @@ -41,7 +39,7 @@ protected function _construct() * @param Mage_Core_Model_Abstract $object * @param int $entityTypeId * @param int $storeId - * @return boolean + * @return bool */ public function loadByEntityStore(Mage_Core_Model_Abstract $object, $entityTypeId, $storeId) { 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..3427a8735f6 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,9 +28,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'); @@ -50,7 +48,7 @@ public function loadByCode($object, $code) /** * Retrieve additional attribute table name for specified entity type * - * @param integer $entityTypeId + * @param int $entityTypeId * @return string */ public function getAdditionalAttributeTable($entityTypeId) diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php index 633367adb73..f354db2bb16 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Eav_Model_Resource_Entity_Type_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('eav/entity_type'); diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php index d4362b4bd12..72bd674a2ec 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php index 1a8c2966837..57bdcd73ce2 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,8 +57,6 @@ class Mage_Eav_Model_Resource_Form_Attribute_Collection extends Mage_Core_Model_ protected $_entityType; /** - * Resource initialization - * * @throws Mage_Core_Exception */ protected function _construct() 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..985b66eb024 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Element/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php index eeb72f04664..9ff41c11b73 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php index ada3b35d3d5..d1318af8bbd 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php index 2f625a9075e..9baf00034e8 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type.php index 3ac0d5176ad..aca3cef9cc2 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Type.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -29,10 +30,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'); @@ -80,7 +77,7 @@ public function getEntityTypes($object) /** * Save entity types after save form type * - * @see Mage_Core_Model_Resource_Db_Abstract#_afterSave($object) + * @see Mage_Core_Model_Resource_Db_Abstract::_afterSave() * * @param Mage_Eav_Model_Resource_Form_Type $object * @inheritDoc diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php index 9a8278ee941..daccd0920db 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php +++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Helper/Mysql4.php b/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php index 30e3b454230..edc36adcf8e 100644 --- a/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Eav/Model/Resource/Helper/Mysql4.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -53,7 +54,7 @@ class Mage_Eav_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Hel * * @param string $tableAlias * @param string $eavType - * @return string|array + * @return string */ public function attributeSelectFields($tableAlias, $eavType) { @@ -108,7 +109,7 @@ public function getLoadAttributesSelectGroups($selects) foreach ($selects as $eavType => $selectGroup) { $mainGroup = array_merge($mainGroup, $selectGroup); } - return [$mainGroup]; + return $mainGroup; } /** diff --git a/app/code/core/Mage/Eav/etc/config.xml b/app/code/core/Mage/Eav/etc/config.xml index 8ca3c5686c1..c32b161e727 100644 --- a/app/code/core/Mage/Eav/etc/config.xml +++ b/app/code/core/Mage/Eav/etc/config.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_Eav - * @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_Eav + * @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/Eav/sql/eav_setup/install-1.6.0.0.php b/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php index 998507b77dd..364fb258df9 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Eav - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php index c587b41b72e..ae2669eca36 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php index 6182455f23c..110cbd4f2dd 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,23 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->getConnection()->dropColumn($this->getTable('eav_attribute'), 'attribute_name'); $installer->getConnection()->dropColumn($this->getTable('eav_attribute'), 'apply_to'); $installer->run(" ALTER TABLE {$this->getTable('eav_attribute')} ADD COLUMN `is_configurable` TINYINT(1) UNSIGNED NOT NULL DEFAULT 1; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php index 2d6a549dc37..ed803a30806 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('eav_attribute'), 'apply_to', 'VARCHAR(255) NOT NULL'); $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php index c4f625a3f41..2c0deab750d 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $table = $installer->getTable('eav/attribute'); $installer->getConnection()->addColumn( $table, @@ -31,4 +32,5 @@ $installer->run(" UPDATE `{$table}` SET is_filterable_in_search=(is_filterable!=0) "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php index 5a7a69d34d0..ba0ebbb646d 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('eav_attribute'), 'is_html_allowed_on_front', "tinyint(1) unsigned not null default '0' after `is_visible_on_front`"); $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php index 451cc5d1dd8..0c157e1f76e 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addConstraint( 'FK_EAV_ENTITY_ATTRIBUTE_ATTRIBUTE', $installer->getTable('eav/entity_attribute'), @@ -32,4 +33,5 @@ 'CASCADE', true ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php index 0ba2db5d83d..22ae0b88a47 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.13-0.7.14.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addColumn($installer->getTable('eav/entity_type'), 'additional_attribute_table', 'varchar(255) NOT NULL DEFAULT \'\''); $installer->getConnection()->addColumn($installer->getTable('eav/entity_type'), 'entity_attribute_collection', 'varchar(255) NOT NULL DEFAULT \'\''); $installer->run(" @@ -38,4 +39,5 @@ CONSTRAINT `FK_ATTRIBUTE_LABEL_STORE` FOREIGN KEY (`store_id`) REFERENCES `{$installer->getTable('core/store')}` (`store_id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php index 4b381ea268b..e9261859057 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.14-0.7.15.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php index 6a12ea75596..3d83d97ba54 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.15-0.7.16.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Eav_Model_Entity_Setup $installer */ $installer = $this; - $installer->startSetup(); + $conn = $installer->getConnection(); foreach (['datetime', 'decimal', 'int', 'text', 'varchar'] as $type) { $tableName = $installer->getTable('eav_entity_' . $type); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php index 2416232ccce..98d9d9521e8 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addColumn($installer->getTable('eav_entity_type'), 'entity_model', 'VARCHAR(255) NOT NULL after entity_type_code'); $installer->getConnection()->addColumn($installer->getTable('eav_entity_type'), 'attribute_model', 'VARCHAR(255) NOT NULL after entity_model'); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php index e656d8a7f7e..f835d13451d 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('eav_attribute'), 'position', 'INT(11) NOT NULL'); $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php index 9bcb8003822..2ac051cbb1f 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('eav_attribute'), 'note', 'VARCHAR( 255 ) NOT NULL'); $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php index 6929fa58e60..7a96a95290c 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); -$installer->getConnection()->addColumn($installer->getTable('eav_attribute_group'), 'default_id', 'SMALLINT( 5 ) NOT NULL'); +$installer->getConnection()->addColumn($installer->getTable('eav_attribute_group'), 'default_id', 'SMALLINT( 5 ) NOT NULL'); $installer->installDefaultGroupIds(); $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php index b1df1ed3d87..9e677008407 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$installer->getTable('eav_attribute_group')} CHANGE `default_id` `default_id` smallint unsigned NULL default '0'; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php index 2d299c23f51..2c81f457b2f 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('eav/attribute'), "is_visible_in_advanced_search", "TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php index ad58e4d05f3..3551972db1f 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$installer->getTable('eav_attribute_group')} CHANGE `attribute_group_name` `attribute_group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL default ''; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php index dc394d8fcab..b8bbcd63874 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Eav_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('eav/attribute'), "is_used_for_price_rules", "TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1'"); $installer->endSetup(); diff --git a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index fa4840922a9..3f122d746ce 100644 --- a/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Eav/sql/eav_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/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..c5c31ec6ea2 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php index 8e6f7aee9ec..a3b76faef33 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php index 8b188368a0b..2d834875788 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php index 55d03966ca5..b2171ae703b 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php index 681ae0defd6..b64c067be47 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -40,7 +41,7 @@ public function getItem() /** * Indicates that block can display gift messages form * - * @return boolean + * @return bool */ public function canDisplayGiftMessage() { diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php index 3156054e613..2073a8b7ad3 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php index 886c1c08ae8..b03162d80c7 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php index b67008357e1..0d04bc90657 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -185,7 +186,7 @@ public function getHtmlId() /** * Indicates that block can display giftmessages form * - * @return boolean + * @return bool */ public function canDisplayGiftmessage() { diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php index 97c79975dc0..98712f5983c 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php index bd9c669c3b3..2e1c5bc7c91 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Helper.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Helper.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php index 1beaa52476d..b69fefa0f70 100644 --- a/app/code/core/Mage/GiftMessage/Block/Message/Inline.php +++ b/app/code/core/Mage/GiftMessage/Block/Message/Inline.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Data.php b/app/code/core/Mage/GiftMessage/Helper/Data.php index 22203eb1abf..c8bda416bd8 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Data.php +++ b/app/code/core/Mage/GiftMessage/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +26,5 @@ */ class Mage_GiftMessage_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_GiftMessage'; } diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php index 8defad483eb..cc55cf5c141 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Message.php +++ b/app/code/core/Mage/GiftMessage/Helper/Message.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_GiftMessage - * @author Magento Core Team + * @author Magento Core Team */ class Mage_GiftMessage_Helper_Message extends Mage_Core_Helper_Data { @@ -34,10 +35,12 @@ class Mage_GiftMessage_Helper_Message extends Mage_Core_Helper_Data const XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS = 'sales/gift_options/allow_items'; const XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER = 'sales/gift_options/allow_order'; + protected $_moduleName = 'Mage_GiftMessage'; + /** * Next id for edit gift message block * - * @var integer + * @var int */ protected $_nextId = 0; @@ -73,7 +76,7 @@ public function getButton($type, Varien_Object $entity) * * @param string $type * @param Varien_Object $entity - * @param boolean $dontDisplayContainer + * @param bool $dontDisplayContainer * @return string */ public function getInline($type, Varien_Object $entity, $dontDisplayContainer = false) @@ -184,7 +187,7 @@ public function getIsMessagesAvailable($type, Varien_Object $entity, $store = nu } /** - * Retrieve escaped and preformated gift message text for specified entity + * Retrieve escaped and preformatted gift message text for specified entity * * @param Varien_Object $entity * @return string|null @@ -234,7 +237,7 @@ public function getCached($key) * Check availability for internal cached data with specified key * * @param string $key - * @return boolean + * @return bool */ public function isCached($key) { @@ -292,7 +295,7 @@ public function getAvailableForAddressItems($items, $store = null) /** * Retrieve gift message with specified id * - * @param integer $messageId + * @param int $messageId * @return Mage_GiftMessage_Model_Message */ public function getGiftMessage($messageId = null) diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index 489b56436a8..b95352aa304 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,10 +24,12 @@ * * @category Mage * @package Mage_GiftMessage - * @author Magento Core Team + * @author Magento Core Team */ class Mage_GiftMessage_Helper_Url extends Mage_Core_Helper_Url { + protected $_moduleName = 'Mage_GiftMessage'; + /** * Retrieve gift message save url * @@ -49,7 +52,7 @@ public function getEditUrl(Varien_Object $item, $type, $params = []) /** * Retrieve gift message button block url * - * @param integer $itemId + * @param int $itemId * @param string $type * @param array $params * @return string @@ -63,7 +66,7 @@ public function getButtonUrl($itemId, $type, $params = []) /** * Retrieve gift message remove url * - * @param integer $itemId + * @param int $itemId * @param string $type * @param array $params * @return string @@ -77,7 +80,7 @@ public function getRemoveUrl($itemId, $type, $params = []) /** * Retrieve gift message save url * - * @param integer $itemId + * @param int $itemId * @param string $type * @param string $giftMessageId * @param array $params diff --git a/app/code/core/Mage/GiftMessage/Model/Api.php b/app/code/core/Mage/GiftMessage/Model/Api.php index 87b83ba87e3..492b6fd8391 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api.php +++ b/app/code/core/Mage/GiftMessage/Model/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Api/V2.php b/app/code/core/Mage/GiftMessage/Model/Api/V2.php index 99e49038989..820804146d6 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api/V2.php +++ b/app/code/core/Mage/GiftMessage/Model/Api/V2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php index ea5c033be37..ea27b4291fd 100644 --- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php +++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Backend/Boolean/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,18 +33,21 @@ class Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config extends Mag * Set attribute default value if value empty * * @param Varien_Object $object + * @return $this */ public function afterLoad($object) { if (!$object->hasData($this->getAttribute()->getAttributeCode())) { $object->setData($this->getAttribute()->getAttributeCode(), $this->getDefaultValue()); } + return $this; } /** * Set attribute default value if value empty * * @param Varien_Object $object + * @return $this */ public function beforeSave($object) { @@ -51,13 +55,14 @@ public function beforeSave($object) && $object->getData($this->getAttribute()->getAttributeCode()) == $this->getDefaultValue()) { $object->unsData($this->getAttribute()->getAttributeCode()); } + return $this; } /** * Validate attribute data * * @param Varien_Object $object - * @return boolean + * @return bool */ public function validate($object) { diff --git a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php index 032cdcfcb64..1e8deedcea1 100644 --- a/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php +++ b/app/code/core/Mage/GiftMessage/Model/Entity/Attribute/Source/Boolean/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/Model/Message.php b/app/code/core/Mage/GiftMessage/Model/Message.php index e8fcb94444a..d690a768133 100644 --- a/app/code/core/Mage/GiftMessage/Model/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Message.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Gift Message model * + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team + * * @method Mage_GiftMessage_Model_Resource_Message _getResource() * @method Mage_GiftMessage_Model_Resource_Message getResource() * @method Mage_GiftMessage_Model_Resource_Message_Collection getCollection() @@ -33,10 +38,6 @@ * @method $this setRecipient(string $value) * @method string getMessage() * @method $this setMessage(string $value) - * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team */ class Mage_GiftMessage_Model_Message extends Mage_Core_Model_Abstract { @@ -79,7 +80,7 @@ public function getEntityModelByType($type) /** * Checks thats gift message is empty * - * @return boolean + * @return bool */ public function isMessageEmpty() { diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php index 995fdc9f13a..0dad216373c 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Gift Message resource model * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team * @deprecated */ class Mage_GiftMessage_Model_Mysql4_Message extends Mage_GiftMessage_Model_Resource_Message diff --git a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php index f07443b6314..88efc79aa98 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Message/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..27d2fbfc17f 100644 --- a/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/GiftMessage/Model/Observer.php index 8c8bc7856de..b5af2c5d4eb 100644 --- a/app/code/core/Mage/GiftMessage/Model/Observer.php +++ b/app/code/core/Mage/GiftMessage/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_GiftMessage - * @author Magento Core Team + * @author Magento Core Team */ class Mage_GiftMessage_Model_Observer extends Varien_Object { @@ -84,7 +85,7 @@ public function salesEventConvertQuoteToOrder(Varien_Event_Observer $observer) * * @deprecated after 1.5.0.0 * @param Mage_Catalog_Model_Product|integer $product - * @return integer|null + * @return int|null */ protected function _getAvailable($product) { diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Message.php b/app/code/core/Mage/GiftMessage/Model/Resource/Message.php index c8ec10e0994..20b26b8a022 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Message.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Message.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Gift Message resource model * - * @category Mage - * @package Mage_GiftMessage - * @author Magento Core Team + * @category Mage + * @package Mage_GiftMessage + * @author Magento Core Team */ class Mage_GiftMessage_Model_Resource_Message extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('giftmessage/message', 'gift_message_id'); diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php index 0de6e6d0eda..85510f35f61 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_GiftMessage_Model_Resource_Message_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('giftmessage/message'); diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php index 86dd8727a86..a3f1ae037a4 100644 --- a/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php +++ b/app/code/core/Mage/GiftMessage/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/controllers/IndexController.php b/app/code/core/Mage/GiftMessage/controllers/IndexController.php index c6a45f8b0b2..94e4d297f0f 100644 --- a/app/code/core/Mage/GiftMessage/controllers/IndexController.php +++ b/app/code/core/Mage/GiftMessage/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/etc/api.xml b/app/code/core/Mage/GiftMessage/etc/api.xml index ad6607924e3..a77a1768a4c 100644 --- a/app/code/core/Mage/GiftMessage/etc/api.xml +++ b/app/code/core/Mage/GiftMessage/etc/api.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. (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/GiftMessage/etc/config.xml b/app/code/core/Mage/GiftMessage/etc/config.xml index b6066211680..25898f3401d 100644 --- a/app/code/core/Mage/GiftMessage/etc/config.xml +++ b/app/code/core/Mage/GiftMessage/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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..45e4217c1b9 100644 --- a/app/code/core/Mage/GiftMessage/etc/system.xml +++ b/app/code/core/Mage/GiftMessage/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php index 000d83cbeb7..f10efc4b530 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php index 2fa26b86152..8444ab36cf7 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $this */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php index 579e7177606..231a545102d 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.1.3-0.7.0.php @@ -7,16 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + $this->startSetup() ->addAttribute('quote', 'gift_message_id', ['type' => 'int', 'visible' => false, 'required' => false]) ->addAttribute('quote_address', 'gift_message_id', ['type' => 'int', 'visible' => false, 'required' => false]) diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php index 48e4e7af3c7..e2449560138 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,17 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_GiftMessage_Model_Resource_Setup $installer */ +$installer = $this; + $installer->updateAttribute('catalog_product', 'gift_message_available', 'is_configurable', 0); diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php index bb324748044..b190cbefc2f 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php index 062ed0ae5c0..715a524552e 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php index d3437ac15b8..bd46ac0ed71 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php index 60390687730..d892e5b4934 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php index f26d706d694..daa2a51fdf6 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $this */ diff --git a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 61452132063..d990c12059b 100644 --- a/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/GiftMessage/sql/giftmessage_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GiftMessage + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_GiftMessage_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php index e335f1938ac..eb6e678c2f3 100644 --- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php +++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php index b7302a1de06..60c8b0cf7ee 100644 --- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php +++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,6 +46,8 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract */ const TYPE_UNIVERSAL = 'universal'; + protected $_moduleName = 'Mage_GoogleAnalytics'; + /** * Whether GA is ready to use * diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php index a741f28c47e..8c732e4fe60 100644 --- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php +++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_GoogleAnalytics + * @author Magento Core Team */ class Mage_GoogleAnalytics_Model_Observer { 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..c5016827497 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleAnalytics + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,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 4b5718b8912..4dac4f31a07 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/adminhtml.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. (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/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml index d34098d998b..bd908e69f84 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/config.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. (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/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml index 3de5af0c866..cffc210a7cf 100644 --- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml +++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php b/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php index 1e41f23aca2..8bf81cd7107 100644 --- a/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/GoogleCheckout/Model/Payment.php b/app/code/core/Mage/GoogleCheckout/Model/Payment.php index 12053d93524..838906c2866 100644 --- a/app/code/core/Mage/GoogleCheckout/Model/Payment.php +++ b/app/code/core/Mage/GoogleCheckout/Model/Payment.php @@ -7,18 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_GoogleCheckout - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_GoogleCheckout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_GoogleCheckout + * @author Magento Core Team * @deprecated after 1.13.1.0 */ class Mage_GoogleCheckout_Model_Payment extends Mage_Payment_Model_Method_Abstract @@ -53,7 +57,7 @@ public function getOrderPlaceRedirectUrl() * * @param Varien_Object $payment * @param float $amount - * @return $this + * @return void */ public function authorize(Varien_Object $payment, $amount) { diff --git a/app/code/core/Mage/GoogleCheckout/etc/config.xml b/app/code/core/Mage/GoogleCheckout/etc/config.xml index 158cafd2f58..94c95a56aa9 100644 --- a/app/code/core/Mage/GoogleCheckout/etc/config.xml +++ b/app/code/core/Mage/GoogleCheckout/etc/config.xml @@ -8,15 +8,16 @@ * 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_GoogleCheckout - * @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_GoogleCheckout + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Export/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php index df46569fee6..f0a92970420 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php index e33818257ff..17116fd65e0 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php index d7d8653899b..ede413302da 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -385,7 +386,7 @@ protected function _prepareColumns() * @param mixed $value * @param Mage_Eav_Model_Entity_Attribute $row * @param Varien_Object $column - * @param boolean $isExport + * @param bool $isExport * @return string */ public function decorateFilter($value, Mage_Eav_Model_Entity_Attribute $row, Varien_Object $column, $isExport) @@ -440,7 +441,7 @@ public function getFilterElementName($attributeCode) * Get row edit URL. * * @param Mage_Catalog_Model_Resource_Eav_Attribute $row - * @return string + * @return false */ public function getRowUrl($row) { 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..7d40c6ede88 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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/Block/Adminhtml/Import/Edit/Form.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php index 42b5ba66e0e..f5f81088336 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php index 297ef1e5b6a..78ae6b83c41 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Frame/Result.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import frame result block. * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Block_Adminhtml_Import_Frame_Result extends Mage_Adminhtml_Block_Template { @@ -101,7 +102,7 @@ public function addError($message) * Add notice message. * * @param mixed $message Message text - * @param boolean $appendImportButton OPTIONAL Append import button to message? + * @param bool $appendImportButton OPTIONAL Append import button to message? * @return $this */ public function addNotice($message, $appendImportButton = false) @@ -120,7 +121,7 @@ public function addNotice($message, $appendImportButton = false) * Add success message. * * @param mixed $message Message text - * @param boolean $appendImportButton OPTIONAL Append import button to message? + * @param bool $appendImportButton OPTIONAL Append import button to message? * @return $this */ public function addSuccess($message, $appendImportButton = false) diff --git a/app/code/core/Mage/ImportExport/Helper/Data.php b/app/code/core/Mage/ImportExport/Helper/Data.php index 00429e25478..2eb6a969aef 100644 --- a/app/code/core/Mage/ImportExport/Helper/Data.php +++ b/app/code/core/Mage/ImportExport/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,6 +35,8 @@ class Mage_ImportExport_Helper_Data extends Mage_Core_Helper_Data const XML_PATH_BUNCH_SIZE = 'general/file/bunch_size'; const XML_PATH_IMPORT_CONFIGURABLE_PAGE_SIZE = 'system/import_csv/configurable_page_size'; + protected $_moduleName = 'Mage_ImportExport'; + /** * Maximum size of uploaded files. * diff --git a/app/code/core/Mage/ImportExport/Model/Abstract.php b/app/code/core/Mage/ImportExport/Model/Abstract.php index 96700e7f325..77c0fcd7778 100644 --- a/app/code/core/Mage/ImportExport/Model/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,7 +41,7 @@ abstract class Mage_ImportExport_Model_Abstract extends Varien_Object /** * Enable loging * - * @var boolean + * @var bool */ protected $_debugMode = false; diff --git a/app/code/core/Mage/ImportExport/Model/Config.php b/app/code/core/Mage/ImportExport/Model/Config.php index 5a3b5d98237..d24e7952c9c 100644 --- a/app/code/core/Mage/ImportExport/Model/Config.php +++ b/app/code/core/Mage/ImportExport/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +57,7 @@ public static function getModels($configKey) * * @static * @param string $configKey - * @param boolean $withEmpty OPTIONAL Include 'Please Select' option or not + * @param bool $withEmpty OPTIONAL Include 'Please Select' option or not * @return array */ public static function getModelsComboOptions($configKey, $withEmpty = false) @@ -77,7 +78,7 @@ public static function getModelsComboOptions($configKey, $withEmpty = false) * * @static * @param string $configKey - * @param boolean $withEmpty OPTIONAL Include 'Please Select' option or not + * @param bool $withEmpty OPTIONAL Include 'Please Select' option or not * @return array */ public static function getModelsArrayOptions($configKey, $withEmpty = false) diff --git a/app/code/core/Mage/ImportExport/Model/Export.php b/app/code/core/Mage/ImportExport/Model/Export.php index eefb196d9f1..c74d486a388 100644 --- a/app/code/core/Mage/ImportExport/Model/Export.php +++ b/app/code/core/Mage/ImportExport/Model/Export.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php index c432208f7e7..402781bcd31 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php index 650235f90c6..9205ed8c2d8 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..2ee78406c4d 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -169,9 +170,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..e0164ae6caa 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,9 +70,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(); @@ -213,14 +211,8 @@ protected function _prepareExport() array_keys($defaultAddrMap) )); foreach ($collection as $customerId => $customer) { - $customerAddress = []; - if (isset($customerAddrs[$customerId])) { - $customerAddress = $customerAddrs[$customerId]; - } - $addressMultiselect= []; - if (isset($addrAttributeMultiSelect[$customerId])) { - $addressMultiselect = $addrAttributeMultiSelect[$customerId]; - } + $customerAddress = $customerAddrs[$customerId] ?? []; + $addressMultiselect = $addrAttributeMultiSelect[$customerId] ?? []; $row = $this->_prepareExportRow($customer, $customerAttributeMultiSelect); $defaultAddrs = $this->_prepareDefaultAddress($customer); @@ -417,9 +409,7 @@ protected function _prepareExportRow($customer, &$attributeMultiSelect) $row[$attrCode] = $attrValue; } } - $row[self::COL_WEBSITE] = $this->_websiteIdToCode[ - $customer['website_id'] === null ? 0 : $customer['website_id'] - ]; + $row[self::COL_WEBSITE] = $this->_websiteIdToCode[$customer['website_id'] ?? 0]; $row[self::COL_STORE] = $this->_storeIdToCode[$customer['store_id']]; return $row; 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 753c1757072..3363bae6443 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Export 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_Export_Entity_Product extends Mage_ImportExport_Model_Export_Entity_Abstract { @@ -109,9 +110,6 @@ class Mage_ImportExport_Model_Export_Entity_Product extends Mage_ImportExport_Mo */ protected $_attributeScopes = []; - /** - * Constructor. - */ public function __construct() { parent::__construct(); @@ -809,9 +807,7 @@ protected function _prepareExport() $row = []; $productId = $option['product_id']; $optionId = $option['option_id']; - $customOptions = isset($customOptionsDataPre[$productId][$optionId]) - ? $customOptionsDataPre[$productId][$optionId] - : []; + $customOptions = $customOptionsDataPre[$productId][$optionId] ?? []; if ($defaultStoreId == $storeId) { $row['_custom_option_type'] = $option['type']; diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php index 58754c1083e..d675a4ba33d 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -82,7 +83,7 @@ public function isSuitable() * Add additional data to attribute. * * @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute - * @return boolean + * @return bool */ public function overrideAttribute(Mage_Catalog_Model_Resource_Eav_Attribute $attribute) { diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php index b0edb4fd2ab..4671754ee8b 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php index 2cf9b0e99bc..b9fa3794913 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product/Type/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..3dc3e97407c 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/ImportExport/Model/Import.php index 7358f09c55d..c3e8434d577 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter.php index ed574866f88..62921675808 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php index 8b9ea16c68d..6ed6eaf1ec0 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,7 +115,7 @@ protected function _init() /** * Return the current element. * - * @return mixed + * @return array */ #[\ReturnTypeWillChange] public function current() @@ -162,7 +163,7 @@ public function seek($position) /** * Checks if current position is valid. * - * @return boolean Returns true on success or false on failure. + * @return bool Returns true on success or false on failure. */ #[\ReturnTypeWillChange] public function valid() diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php index fd042e462f3..9fc1370dc60 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..dc00736b572 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -187,9 +188,6 @@ abstract class Mage_ImportExport_Model_Import_Entity_Abstract */ protected $_uniqueAttributes = []; - /** - * Constructor. - */ public function __construct() { $entityType = Mage::getSingleton('eav/config')->getEntityType($this->getEntityTypeCode()); @@ -215,7 +213,7 @@ protected function _getSource() * Import data rows. * * @abstract - * @return boolean + * @return bool */ abstract protected function _importData(); @@ -537,7 +535,7 @@ public function isAttributeParticular($attrCode) * @param array $attrParams Attribute params * @param array $rowData Row data * @param int $rowNum - * @return boolean + * @return bool */ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $rowNum) { @@ -622,7 +620,7 @@ public function isRowAllowedToImport(array $rowData, $rowNum) * * @param array $rowData * @param int $rowNum - * @return boolean + * @return bool */ abstract public function validateRow(array $rowData, $rowNum); 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..5a5a298bcb7 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -101,7 +102,7 @@ class Mage_ImportExport_Model_Import_Entity_Customer extends Mage_ImportExport_M /** * Customer account sharing. TRUE - is global, FALSE - is per website. * - * @var boolean + * @var bool */ protected $_customerGlobal; @@ -208,9 +209,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer extends Mage_ImportExport_M */ protected $_websiteIdToCode = []; - /** - * Constructor. - */ public function __construct() { parent::__construct(); @@ -590,7 +588,7 @@ public function isAttributeParticular($attrCode) * * @param array $rowData * @param int $rowNum - * @return boolean + * @return bool */ public function validateRow(array $rowData, $rowNum) { 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..b47cbf18d50 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -128,8 +129,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) @@ -149,7 +148,7 @@ public function __construct(Mage_ImportExport_Model_Import_Entity_Customer $cust /** * Import data rows. * - * @return boolean + * @return bool */ protected function _importData() { @@ -470,7 +469,7 @@ public function isAttributeParticular($attrCode) * * @param array $rowData * @param int $rowNum - * @return boolean + * @return bool */ public function validateRow(array $rowData, $rowNum) { 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 69e838c6a03..cea0fb50c6a 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Entity_Product extends Mage_ImportExport_Model_Import_Entity_Abstract { @@ -339,7 +340,7 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo * 'type_id' => (string) product type * 'attr_set_id' => (int) product attribute set ID * 'entity_id' => (int) product ID - * 'supported_type' => (boolean) is product type supported by current version of import module + * 'supported_type' => (bool) is product type supported by current version of import module * ) * * @var array @@ -429,10 +430,6 @@ class Mage_ImportExport_Model_Import_Entity_Product extends Mage_ImportExport_Mo */ protected $_urlKeyAttributeId; - /** - * Constructor. - * - */ public function __construct() { parent::__construct(); @@ -2079,7 +2076,7 @@ public function getWebsiteCodes() * * @param array $rowData * @param int $rowNum - * @return boolean + * @return bool */ public function validateRow(array $rowData, $rowNum) { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php index aafd8b0b064..1651939e6ae 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -237,8 +238,8 @@ public function getParticularAttributes() * * @param array $rowData * @param int $rowNum - * @param boolean $isNewProduct OPTIONAL. - * @return boolean + * @param bool $isNewProduct OPTIONAL. + * @return bool */ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true) { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php index 5ad88ee4885..3d4fb563147 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Configurable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -146,11 +147,7 @@ protected function _addAttributeParams($attrSetName, array $attrParams) */ protected function _getSuperAttributeId($productId, $attributeId) { - if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) { - return $this->_productSuperAttrs["{$productId}_{$attributeId}"]; - } else { - return null; - } + return $this->_productSuperAttrs["{$productId}_{$attributeId}"] ?? null; } /** @@ -168,7 +165,7 @@ protected function _isAttributeRequiredCheckNeeded($attrCode) * Is attribute is super-attribute? * * @param string $attrCode - * @return boolean + * @return bool */ protected function _isAttributeSuper($attrCode) { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php index eca2d95ea59..f6dcabe42a1 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..37105b875c1 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Proxy/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php index 82808cf7c96..71330625328 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import proxy 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_Proxy_Product extends Mage_Catalog_Model_Product { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php index 8998b2644fe..26bbbc94d41 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Import proxy product resource * - * @category Mage - * @package Mage_ImportExport - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Import_Proxy_Product_Resource extends Mage_Catalog_Model_Resource_Eav_Mysql4_Product { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php index 1312e7d8825..e3665e19e5f 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php index e759ba82236..56a27729f96 100644 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php +++ b/app/code/core/Mage/ImportExport/Model/Mysql4/Import/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php index 7cf6f2a05d4..e9dc6af445c 100644 --- a/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..b9beab7a7a4 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Helper/Mysql4.php b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php index fd2be3a8811..2063cd5fbca 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * ImportExport MySQL resource helper model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_ImportExport + * @author Magento Core Team */ class Mage_ImportExport_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Mysql4 { diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php b/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php index f46b74dfb84..b851ff176c4 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,9 +33,6 @@ class Mage_ImportExport_Model_Resource_Import_Data extends Mage_Core_Model_Resou */ protected $_iterator = null; - /** - * Resource initialization - */ protected function _construct() { $this->_init('importexport/importdata', 'id'); diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php b/app/code/core/Mage/ImportExport/Model/Resource/Setup.php index 8e655209214..76fecabde30 100644 --- a/app/code/core/Mage/ImportExport/Model/Resource/Setup.php +++ b/app/code/core/Mage/ImportExport/Model/Resource/Setup.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Model/Source/Export/Entity.php b/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php index 07acc32ea62..18559247bf3 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Export/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php b/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php index 4c11840f9e9..84e006492b7 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Export/Format.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php b/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php index 711d71036ba..1e334bec53d 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Import/Behavior.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php b/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php index caecec3ed5b..74955198e62 100644 --- a/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php +++ b/app/code/core/Mage/ImportExport/Model/Source/Import/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php index 166e9b0057e..6c177d9295e 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php index bd6abbf14e5..6098cf44e20 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/etc/adminhtml.xml b/app/code/core/Mage/ImportExport/etc/adminhtml.xml index 4b6d8209c32..660f70c7ac7 100644 --- a/app/code/core/Mage/ImportExport/etc/adminhtml.xml +++ b/app/code/core/Mage/ImportExport/etc/adminhtml.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. (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/ImportExport/etc/config.xml b/app/code/core/Mage/ImportExport/etc/config.xml index 7265d4da94d..491f9d9674b 100644 --- a/app/code/core/Mage/ImportExport/etc/config.xml +++ b/app/code/core/Mage/ImportExport/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c87c44c0528 100644 --- a/app/code/core/Mage/ImportExport/etc/system.xml +++ b/app/code/core/Mage/ImportExport/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php index 62175e3cea6..55d788d9ce1 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php index f825163e2f3..75682cb5f2a 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-install-0.1.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_ImportExport_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php index 31258adcb35..dff96b29d48 100644 --- a/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/ImportExport/sql/importexport_setup/mysql4-upgrade-1.6.0.1-1.6.0.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ImportExport + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_ImportExport_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php b/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php index 0996af04b19..9bf349430c5 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Notifications.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Notifications extends Mage_Adminhtml_Block_Template { /** diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process.php b/app/code/core/Mage/Index/Block/Adminhtml/Process.php index a62a0236b91..f21b170a500 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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 extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php index 8950852d45c..af03f892967 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,6 +26,9 @@ */ class Mage_Index_Block_Adminhtml_Process_Edit extends Mage_Adminhtml_Block_Widget_Form_Container { + /** + * Mage_Index_Block_Adminhtml_Process_Edit constructor. + */ public function __construct() { $this->_objectId = 'process_id'; @@ -75,5 +79,6 @@ public function getHeaderText() if ($process && $process->getId()) { return Mage::helper('index')->__("'%s' Index Process Information", $process->getIndexer()->getName()); } + return ''; } } diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php index a798e21245a..18c63d2b244 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php index 56d8d9e35e8..0833c06f21d 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Edit/Tab/Main.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Tab_Main extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface { /** @@ -93,7 +99,7 @@ public function canShowTab() /** * Returns status flag about this tab hidden or not * - * @return true + * @return false */ public function isHidden() { 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..e92f24e007b 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 @@ -7,20 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { - + /** + * Mage_Index_Block_Adminhtml_Process_Edit_Tabs constructor. + */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php index 7e917d5fbaa..8994a14f4f3 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -144,7 +145,6 @@ protected function _prepareColumns() $this->addColumn('ended_at', [ 'header' => Mage::helper('index')->__('Updated At'), 'type' => 'datetime', - 'width' => '180', 'align' => 'left', 'index' => 'ended_at', 'frame_callback' => [$this, 'decorateDate'] diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php index 16e8baf3647..6deca09fbfc 100644 --- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php +++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid/Massaction.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Mass-action block for process/list grid * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Block_Adminhtml_Process_Grid_Massaction extends Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract { diff --git a/app/code/core/Mage/Index/Exception.php b/app/code/core/Mage/Index/Exception.php index d8fafc9c21b..c7a36ef1ba8 100644 --- a/app/code/core/Mage/Index/Exception.php +++ b/app/code/core/Mage/Index/Exception.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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 */ class Mage_Index_Exception extends Mage_Core_Exception { diff --git a/app/code/core/Mage/Index/Helper/Data.php b/app/code/core/Mage/Index/Helper/Data.php index afc584ea5c1..30dc0c55ff8 100644 --- a/app/code/core/Mage/Index/Helper/Data.php +++ b/app/code/core/Mage/Index/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +25,5 @@ */ class Mage_Index_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Index'; } diff --git a/app/code/core/Mage/Index/Model/Event.php b/app/code/core/Mage/Index/Model/Event.php index 325b825075a..06103be9bbe 100644 --- a/app/code/core/Mage/Index/Model/Event.php +++ b/app/code/core/Mage/Index/Model/Event.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -257,7 +258,7 @@ public function getNewData($useNamespace = true) $data = []; } if ($useNamespace && $this->_dataNamespace) { - return isset($data[$this->_dataNamespace]) ? $data[$this->_dataNamespace] : []; + return $data[$this->_dataNamespace] ?? []; } return $data; } diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index fa3c61b71bb..9455cb0088d 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -183,7 +184,7 @@ public function unlockIndexer() } /** - * Check if onject actions are locked + * Check if object actions are locked * * @deprecated after 1.6.1.0 * @return bool diff --git a/app/code/core/Mage/Index/Model/Indexer/Abstract.php b/app/code/core/Mage/Index/Model/Indexer/Abstract.php index 50b11b5b617..1cae4c9ef83 100644 --- a/app/code/core/Mage/Index/Model/Indexer/Abstract.php +++ b/app/code/core/Mage/Index/Model/Indexer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -145,7 +146,7 @@ public function reindexAll() } /** - * Try dynamicly detect and call event hanler from resource model. + * Try dynamically detect and call event handler from resource model. * Handler name will be generated from event entity and type code * * @param Mage_Index_Model_Event $event diff --git a/app/code/core/Mage/Index/Model/Lock.php b/app/code/core/Mage/Index/Model/Lock.php index 9e5c58b86eb..426b0c2fa29 100644 --- a/app/code/core/Mage/Index/Model/Lock.php +++ b/app/code/core/Mage/Index/Model/Lock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Lock model * - * @category Mage - * @package Mage_Core - * @author Magento Core Team core@magentocommerce.com + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Lock { @@ -67,9 +68,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..9d1f385457f 100644 --- a/app/code/core/Mage/Index/Model/Lock/Storage/Db.php +++ b/app/code/core/Mage/Index/Model/Lock/Storage/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,9 +38,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/Lock/Storage/Interface.php b/app/code/core/Mage/Index/Model/Lock/Storage/Interface.php index 06e5447d728..3ac3a0a81c6 100644 --- a/app/code/core/Mage/Index/Model/Lock/Storage/Interface.php +++ b/app/code/core/Mage/Index/Model/Lock/Storage/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract lock storage * - * @category Mage - * @package Mage_Core - * @author Magento Core Team core@magentocommerce.com + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ interface Mage_Index_Model_Lock_Storage_Interface { diff --git a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php b/app/code/core/Mage/Index/Model/Mysql4/Abstract.php index d1b038b583b..cee1bdd1ce6 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event.php b/app/code/core/Mage/Index/Model/Mysql4/Event.php index 13ae5872b2b..78d18e4f6a3 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Event.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php index 2a9f28304ab..d72508ed365 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Event/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process.php b/app/code/core/Mage/Index/Model/Mysql4/Process.php index 69d8fc5880e..2fcf51128a6 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Process.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Process.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Process extends Mage_Index_Model_Resource_Process diff --git a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php b/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php index 4b3adc57f7d..2976e91d953 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Process/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Mysql4/Setup.php b/app/code/core/Mage/Index/Model/Mysql4/Setup.php index 944dbf7b588..f47caf26f36 100644 --- a/app/code/core/Mage/Index/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Index/Model/Mysql4/Setup.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Index/Model/Observer.php index 47325cd6e0b..1b1bfa30218 100644 --- a/app/code/core/Mage/Index/Model/Observer.php +++ b/app/code/core/Mage/Index/Model/Observer.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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_Model_Observer { /** diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index 05707407685..e3242a12b57 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Index + * @author Magento Core Team + * * @method Mage_Index_Model_Resource_Process _getResource() * @method Mage_Index_Model_Resource_Process getResource() * @method string getIndexCode() @@ -34,10 +39,6 @@ * @method $this setMode(string $value) * @method bool getForcePartialReindex() * @method $this setForcePartialReindex(bool $value) - * - * @category Mage - * @package Mage_Index - * @author Magento Core Team */ class Mage_Index_Model_Process extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Index/Model/Resource/Abstract.php b/app/code/core/Mage/Index/Model/Resource/Abstract.php index e9ed106b2a8..8f70ad49f1b 100644 --- a/app/code/core/Mage/Index/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Index/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Event.php b/app/code/core/Mage/Index/Model/Resource/Event.php index f0c009b18f5..057931e4736 100644 --- a/app/code/core/Mage/Index/Model/Resource/Event.php +++ b/app/code/core/Mage/Index/Model/Resource/Event.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Event/Collection.php b/app/code/core/Mage/Index/Model/Resource/Event/Collection.php index d81c548f57d..22f396f606e 100644 --- a/app/code/core/Mage/Index/Model/Resource/Event/Collection.php +++ b/app/code/core/Mage/Index/Model/Resource/Event/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php b/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php index 1a8cbe462f8..292c9bcca67 100644 --- a/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php +++ b/app/code/core/Mage/Index/Model/Resource/Helper/Lock/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract lock helper * - * @category Mage - * @package Mage_Core - * @author Magento Core Team core@magentocommerce.com + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ interface Mage_Index_Model_Resource_Helper_Lock_Interface { diff --git a/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php index 457803a8aa5..c22db4e17f5 100644 --- a/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Index/Model/Resource/Helper/Mysql4.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Index resource helper class for MySQL adapter * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Mysql4 implements Mage_Index_Model_Resource_Helper_Lock_Interface { 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 a4e017d2880..39555ff0eba 100644 --- a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php +++ b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Lock resource model * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Resource_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.php b/app/code/core/Mage/Index/Model/Resource/Process.php index 986c46f7646..57a6bf2d81d 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process.php +++ b/app/code/core/Mage/Index/Model/Resource/Process.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Index Process Resource Model * - * @category Mage - * @package Mage_Index - * @author Magento Core Team + * @category Mage + * @package Mage_Index + * @author Magento Core Team */ class Mage_Index_Model_Resource_Process extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize table and table pk - * - */ protected function _construct() { $this->_init('index/process', 'process_id'); 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..7762a7d10d1 100644 --- a/app/code/core/Mage/Index/Model/Resource/Process/Collection.php +++ b/app/code/core/Mage/Index/Model/Resource/Process/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,15 +29,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..6cb64c23cc6 100644 --- a/app/code/core/Mage/Index/Model/Resource/Setup.php +++ b/app/code/core/Mage/Index/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/controllers/Adminhtml/ProcessController.php b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php index a722846d4d4..376b5188289 100644 --- a/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php +++ b/app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Adminhtml_ProcessController extends Mage_Adminhtml_Controller_Action { diff --git a/app/code/core/Mage/Index/etc/adminhtml.xml b/app/code/core/Mage/Index/etc/adminhtml.xml index 6502a7d23c2..28e14d13eff 100644 --- a/app/code/core/Mage/Index/etc/adminhtml.xml +++ b/app/code/core/Mage/Index/etc/adminhtml.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_Index - * @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_Index + * @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/Index/etc/config.xml b/app/code/core/Mage/Index/etc/config.xml index c7d721767ff..bf4d6837c3a 100644 --- a/app/code/core/Mage/Index/etc/config.xml +++ b/app/code/core/Mage/Index/etc/config.xml @@ -8,15 +8,16 @@ * 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_Index - * @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_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php b/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php index c4b52eb09fc..01f6741f5d2 100644 --- a/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Index - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php index b374968dd7f..57ff1516a81 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-install-1.4.0.0.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Index_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); + $installer->run(" CREATE TABLE `{$this->getTable('index/event')}` ( `event_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index 26d7a135e4d..801595dfc45 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Index_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index aa6bad3c92a..cc38dfbaed6 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Index_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 8193f4a4c00..96278e7b1d3 100644 --- a/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Index/sql/index_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Index + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Index_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Install/Block/Abstract.php b/app/code/core/Mage/Install/Block/Abstract.php index 5ced7915ea9..751d230eca2 100644 --- a/app/code/core/Mage/Install/Block/Abstract.php +++ b/app/code/core/Mage/Install/Block/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Admin.php b/app/code/core/Mage/Install/Block/Admin.php index be965aa9d65..afeb37608dd 100644 --- a/app/code/core/Mage/Install/Block/Admin.php +++ b/app/code/core/Mage/Install/Block/Admin.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Begin.php b/app/code/core/Mage/Install/Block/Begin.php index 3f8fd16be60..625f51077e1 100644 --- a/app/code/core/Mage/Install/Block/Begin.php +++ b/app/code/core/Mage/Install/Block/Begin.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Config.php b/app/code/core/Mage/Install/Block/Config.php index 1dae34dd6fc..50f7696679d 100644 --- a/app/code/core/Mage/Install/Block/Config.php +++ b/app/code/core/Mage/Install/Block/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Db/Main.php b/app/code/core/Mage/Install/Block/Db/Main.php index ad935e05f9b..7e464d8907d 100644 --- a/app/code/core/Mage/Install/Block/Db/Main.php +++ b/app/code/core/Mage/Install/Block/Db/Main.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Database config installation block * - * @author Magento Core Team + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_Block_Db_Main extends Mage_Core_Block_Template { @@ -107,5 +110,4 @@ public function getFormData() } return $data; } - } diff --git a/app/code/core/Mage/Install/Block/Db/Type.php b/app/code/core/Mage/Install/Block/Db/Type.php index 8b6f6ae9e2c..d3e047ae845 100644 --- a/app/code/core/Mage/Install/Block/Db/Type.php +++ b/app/code/core/Mage/Install/Block/Db/Type.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Db/Type/Mysql4.php b/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php index 7b3ed62bb9c..af5a43c5cff 100644 --- a/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php +++ b/app/code/core/Mage/Install/Block/Db/Type/Mysql4.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Mysql4 config installation block * - * @author Magento Core Team + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_Block_Db_Type_Mysql4 extends Mage_Install_Block_Db_Type { diff --git a/app/code/core/Mage/Install/Block/End.php b/app/code/core/Mage/Install/Block/End.php index a453c5b3eb8..53f6f599710 100644 --- a/app/code/core/Mage/Install/Block/End.php +++ b/app/code/core/Mage/Install/Block/End.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Block/Locale.php b/app/code/core/Mage/Install/Block/Locale.php index 8ab6d374200..596803ae568 100644 --- a/app/code/core/Mage/Install/Block/Locale.php +++ b/app/code/core/Mage/Install/Block/Locale.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_Block_Locale extends Mage_Install_Block_Abstract { - public function __construct() { parent::__construct(); @@ -158,5 +158,4 @@ public function getFormData() } return $data; } - } diff --git a/app/code/core/Mage/Install/Block/State.php b/app/code/core/Mage/Install/Block/State.php index 193ccf022d1..6bbd9c3c814 100644 --- a/app/code/core/Mage/Install/Block/State.php +++ b/app/code/core/Mage/Install/Block/State.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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 +33,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/Controller/Action.php b/app/code/core/Mage/Install/Controller/Action.php index 54d3021a860..35fc2d13673 100644 --- a/app/code/core/Mage/Install/Controller/Action.php +++ b/app/code/core/Mage/Install/Controller/Action.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Controller/Router/Install.php b/app/code/core/Mage/Install/Controller/Router/Install.php index 7a3bd0a77b5..e24e9986a2a 100644 --- a/app/code/core/Mage/Install/Controller/Router/Install.php +++ b/app/code/core/Mage/Install/Controller/Router/Install.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,7 +30,7 @@ class Mage_Install_Controller_Router_Install extends Mage_Core_Controller_Varien * Check if current controller instance is allowed in current router. * * @param Mage_Core_Controller_Varien_Action $controllerInstance - * @return boolean + * @return bool */ protected function _validateControllerInstance($controllerInstance) { diff --git a/app/code/core/Mage/Install/Helper/Data.php b/app/code/core/Mage/Install/Helper/Data.php index 3738f83d67e..6d7d930049a 100644 --- a/app/code/core/Mage/Install/Helper/Data.php +++ b/app/code/core/Mage/Install/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +25,5 @@ */ class Mage_Install_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Install'; } diff --git a/app/code/core/Mage/Install/Model/Config.php b/app/code/core/Mage/Install/Model/Config.php index 01ee8d60672..6efbde76237 100644 --- a/app/code/core/Mage/Install/Model/Config.php +++ b/app/code/core/Mage/Install/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php index ecf4b6d966b..f9386bd8e90 100644 --- a/app/code/core/Mage/Install/Model/Installer.php +++ b/app/code/core/Mage/Install/Model/Installer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_Model_Installer extends Varien_Object { - /** * Installer host response used to check urls * @@ -37,7 +37,7 @@ class Mage_Install_Model_Installer extends Varien_Object /** * Installer data model used to store data between installation steps * - * @var Varien_Object + * @var Mage_Install_Model_Session */ protected $_dataModel; @@ -54,7 +54,7 @@ public function isApplicationInstalled() /** * Get data model * - * @return Varien_Object + * @return Mage_Install_Model_Session */ public function getDataModel() { @@ -237,15 +237,9 @@ public function createAdministrator($data) //run time flag to force saving entered password $data->setForceNewPassword(true); - $data->save(); $data->setRoleIds([1])->saveRelations(); - /*Mage::getModel("permissions/user")->setRoleId(1) - ->setUserId($user->getId()) - ->setFirstname($user->getFirstname()) - ->add();*/ - return true; } @@ -303,5 +297,4 @@ public function finish() Mage::app()->saveUseCache($cacheData); return $this; } - } diff --git a/app/code/core/Mage/Install/Model/Installer/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Abstract.php index 8169e9cdfd3..9bf418b32fc 100644 --- a/app/code/core/Mage/Install/Model/Installer/Abstract.php +++ b/app/code/core/Mage/Install/Model/Installer/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Config.php b/app/code/core/Mage/Install/Model/Installer/Config.php index aaf04f55b06..8050ab9c71a 100644 --- a/app/code/core/Mage/Install/Model/Installer/Config.php +++ b/app/code/core/Mage/Install/Model/Installer/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php index cd86aa9adb3..48d6e4968a6 100644 --- a/app/code/core/Mage/Install/Model/Installer/Console.php +++ b/app/code/core/Mage/Install/Model/Installer/Console.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -97,7 +98,7 @@ protected function _getOptions() * Set and validate arguments * * @param array $args - * @return boolean + * @return bool */ public function setArgs($args = null) { @@ -162,7 +163,7 @@ public function setArgs($args = null) * Set args values */ foreach ($this->_getOptions() as $name => $option) { - $this->_args[$name] = isset($args[$name]) ? $args[$name] : ''; + $this->_args[$name] = $args[$name] ?? ''; } return true; @@ -183,7 +184,7 @@ public function addError($error) /** * Check if there were any errors * - * @return boolean + * @return bool */ public function hasErrors() { @@ -207,7 +208,7 @@ public function getErrors() * Case insensitive * * @param string $value - * @return boolean + * @return bool */ protected function _checkFlag($value) { @@ -242,7 +243,7 @@ public function getEncryptionKey() * Init installation * * @param Mage_Core_Model_App $app - * @return boolean + * @return bool */ public function init(Mage_Core_Model_App $app) { @@ -314,7 +315,7 @@ protected function _prepareData() /** * Install Magento * - * @return boolean + * @return bool */ public function install() { @@ -456,7 +457,7 @@ public function printOptions() * Check if installer is run in shell, and redirect if run on web * * @param string $url fallback url to redirect to - * @return boolean + * @return bool */ public function checkConsole($url=null) { diff --git a/app/code/core/Mage/Install/Model/Installer/Data.php b/app/code/core/Mage/Install/Model/Installer/Data.php index bbfb3f9c10e..43bd86abece 100644 --- a/app/code/core/Mage/Install/Model/Installer/Data.php +++ b/app/code/core/Mage/Install/Model/Installer/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db.php b/app/code/core/Mage/Install/Model/Installer/Db.php index 3f683025b24..ed18d218e38 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db.php +++ b/app/code/core/Mage/Install/Model/Installer/Db.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php index 2579d5d4014..9feaf5bdc1a 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php +++ b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php b/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php index e9f89266dff..5220cbbca0e 100644 --- a/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php +++ b/app/code/core/Mage/Install/Model/Installer/Db/Mysql4.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Install - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Install_Model_Installer_Db_Mysql4 extends Mage_Install_Model_Installer_Db_Abstract { diff --git a/app/code/core/Mage/Install/Model/Installer/Env.php b/app/code/core/Mage/Install/Model/Installer/Env.php index 16c05851285..c884b5b7b51 100644 --- a/app/code/core/Mage/Install/Model/Installer/Env.php +++ b/app/code/core/Mage/Install/Model/Installer/Env.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Installer/Filesystem.php b/app/code/core/Mage/Install/Model/Installer/Filesystem.php index 8f411083acc..bd9ab31e2e9 100644 --- a/app/code/core/Mage/Install/Model/Installer/Filesystem.php +++ b/app/code/core/Mage/Install/Model/Installer/Filesystem.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/Model/Observer.php b/app/code/core/Mage/Install/Model/Observer.php index 733a26f80fa..20cdd3cd8c8 100644 --- a/app/code/core/Mage/Install/Model/Observer.php +++ b/app/code/core/Mage/Install/Model/Observer.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Installation event observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Install + * @author Magento Core Team */ class Mage_Install_Model_Observer { diff --git a/app/code/core/Mage/Install/Model/Session.php b/app/code/core/Mage/Install/Model/Session.php index 0993cf5f38e..b461f590324 100644 --- a/app/code/core/Mage/Install/Model/Session.php +++ b/app/code/core/Mage/Install/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..a424f6e8ab3 100644 --- a/app/code/core/Mage/Install/Model/Wizard.php +++ b/app/code/core/Mage/Install/Model/Wizard.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/IndexController.php b/app/code/core/Mage/Install/controllers/IndexController.php index 68ff7f4eb61..6b77c98600e 100644 --- a/app/code/core/Mage/Install/controllers/IndexController.php +++ b/app/code/core/Mage/Install/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Install - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Install/controllers/WizardController.php b/app/code/core/Mage/Install/controllers/WizardController.php index b0b759e573e..d755098b3b0 100644 --- a/app/code/core/Mage/Install/controllers/WizardController.php +++ b/app/code/core/Mage/Install/controllers/WizardController.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 6bc9cfa31ab..1d0908eebe4 100644 --- a/app/code/core/Mage/Install/etc/config.xml +++ b/app/code/core/Mage/Install/etc/config.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_Install - * @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_Install + * @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/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml index 3494ae46533..4a8b1153dfb 100644 --- a/app/code/core/Mage/Install/etc/install.xml +++ b/app/code/core/Mage/Install/etc/install.xml @@ -8,15 +8,16 @@ * 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_Install - * @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_Install + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> @@ -71,21 +72,26 @@ - + + - - + - - - - + + + + + + + + + diff --git a/app/code/core/Mage/Log/Helper/Data.php b/app/code/core/Mage/Log/Helper/Data.php index 58e3b0fe36e..018ae9ce61b 100644 --- a/app/code/core/Mage/Log/Helper/Data.php +++ b/app/code/core/Mage/Log/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Log_Helper_Data extends Mage_Core_Helper_Abstract { const XML_PATH_LOG_ENABLED = 'system/log/enable_log'; + protected $_moduleName = 'Mage_Log'; + /** * @var int */ @@ -45,8 +48,7 @@ class Mage_Log_Helper_Data extends Mage_Core_Helper_Abstract */ public function __construct(array $data = []) { - $this->_logLevel = isset($data['log_level']) ? $data['log_level'] - : intval(Mage::getStoreConfig(self::XML_PATH_LOG_ENABLED)); + $this->_logLevel = $data['log_level'] ?? intval(Mage::getStoreConfig(self::XML_PATH_LOG_ENABLED)); } /** diff --git a/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php b/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php index 6342dbd6c07..af8030e301f 100644 --- a/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php +++ b/app/code/core/Mage/Log/Model/Adminhtml/System/Config/Source/Loglevel.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Log/Model/Aggregation.php b/app/code/core/Mage/Log/Model/Aggregation.php index a2fa7a8623c..e4c5256edd1 100644 --- a/app/code/core/Mage/Log/Model/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Aggregation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Cron.php b/app/code/core/Mage/Log/Model/Cron.php index 1030b51aba5..75021d7e855 100644 --- a/app/code/core/Mage/Log/Model/Cron.php +++ b/app/code/core/Mage/Log/Model/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Customer.php b/app/code/core/Mage/Log/Model/Customer.php index 011778b6e51..70fbe419cc7 100644 --- a/app/code/core/Mage/Log/Model/Customer.php +++ b/app/code/core/Mage/Log/Model/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +69,7 @@ public function loadByCustomer($customer) /** * Return last login at in Unix time format * - * @return int + * @return int|null */ public function getLoginAtTimestamp() { diff --git a/app/code/core/Mage/Log/Model/Log.php b/app/code/core/Mage/Log/Model/Log.php index 4ebfcb8507d..de5e783f6ea 100644 --- a/app/code/core/Mage/Log/Model/Log.php +++ b/app/code/core/Mage/Log/Model/Log.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php index 17763a1b492..946c388bf3c 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Aggregation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Customer.php b/app/code/core/Mage/Log/Model/Mysql4/Customer.php index 0a4045432e9..e7d79131ff5 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Customer.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Log.php b/app/code/core/Mage/Log/Model/Mysql4/Log.php index 084c6cce190..c5b9714acc7 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Log.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Log.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 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..ef5f3784151 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php index df6fa97dca0..b785f9b5fbf 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php index 830fcff6e06..393db0d07c0 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php index 417c17dabe7..dce5f786848 100644 --- a/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php +++ b/app/code/core/Mage/Log/Model/Mysql4/Visitor/Online/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Aggregation.php b/app/code/core/Mage/Log/Model/Resource/Aggregation.php index b3a9ba8610e..29f9a82f6f1 100644 --- a/app/code/core/Mage/Log/Model/Resource/Aggregation.php +++ b/app/code/core/Mage/Log/Model/Resource/Aggregation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Log_Model_Resource_Aggregation extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('log/summary_table', 'log_summary_id'); diff --git a/app/code/core/Mage/Log/Model/Resource/Customer.php b/app/code/core/Mage/Log/Model/Resource/Customer.php index 3348fe69b85..80cfc0873b9 100644 --- a/app/code/core/Mage/Log/Model/Resource/Customer.php +++ b/app/code/core/Mage/Log/Model/Resource/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,9 +70,6 @@ class Mage_Log_Model_Resource_Customer extends Mage_Core_Model_Resource_Db_Abstr */ protected $_quoteTable; - /** - * Resource initialization - */ protected function _construct() { $this->_init('log/customer', 'log_id'); diff --git a/app/code/core/Mage/Log/Model/Resource/Log.php b/app/code/core/Mage/Log/Model/Resource/Log.php index 9e1f97f0cfa..7ca0de843e7 100644 --- a/app/code/core/Mage/Log/Model/Resource/Log.php +++ b/app/code/core/Mage/Log/Model/Resource/Log.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,6 @@ */ class Mage_Log_Model_Resource_Log extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Init Resource model and connection - * - */ protected function _construct() { $this->_init('log/visitor', 'visitor_id'); diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor.php b/app/code/core/Mage/Log/Model/Resource/Visitor.php index 4585a39add8..ebc57125e0e 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -41,14 +42,9 @@ class Mage_Log_Model_Resource_Visitor extends Mage_Core_Model_Resource_Db_Abstra public function __construct(array $data = []) { parent::__construct(); - $this->_urlLoggingCondition = isset($data['log_condition']) - ? $data['log_condition'] : Mage::helper('log'); + $this->_urlLoggingCondition = $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/Collection.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php index 4a8578b4751..64adb9d2f23 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -207,18 +208,14 @@ public function addFieldToFilter($fieldName, $condition = null) */ protected function _getFieldMap($fieldName) { - if (isset($this->_fieldMap[$fieldName])) { - return $this->_fieldMap[$fieldName]; - } else { - return 'main_table.' . $fieldName; - } + return $this->_fieldMap[$fieldName] ?? ('main_table.' . $fieldName); } /** * Load data * - * @param boolean $printQuery - * @param boolean $logQuery + * @param bool $printQuery + * @param bool $logQuery * @return Mage_Core_Model_Resource_Db_Collection_Abstract */ public function load($printQuery = false, $logQuery = false) @@ -233,7 +230,7 @@ public function load($printQuery = false, $logQuery = false) /** * Return true if online filter used * - * @return boolean + * @return bool */ public function getIsOnlineFilterUsed() { 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 9367591f68e..9fd723a647c 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,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/Resource/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php index 24df507d230..08abc2edc39 100644 --- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php +++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php index ef541b6d243..47b6fe392ee 100644 --- a/app/code/core/Mage/Log/Model/Visitor.php +++ b/app/code/core/Mage/Log/Model/Visitor.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Log/Model/Visitor/Online.php b/app/code/core/Mage/Log/Model/Visitor/Online.php index e46b156f4f2..453702595af 100644 --- a/app/code/core/Mage/Log/Model/Visitor/Online.php +++ b/app/code/core/Mage/Log/Model/Visitor/Online.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -46,9 +47,6 @@ class Mage_Log_Model_Visitor_Online extends Mage_Core_Model_Abstract const XML_PATH_ONLINE_INTERVAL = 'customer/online_customers/online_minutes_interval'; const XML_PATH_UPDATE_FREQUENCY = 'log/visitor/online_update_frequency'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('log/visitor_online'); diff --git a/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php index f4faa862ddd..3f3906223ed 100644 --- a/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Log/data/log_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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 17d940f888c..866c5b060dd 100644 --- a/app/code/core/Mage/Log/etc/config.xml +++ b/app/code/core/Mage/Log/etc/config.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. (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/Log/etc/system.xml b/app/code/core/Mage/Log/etc/system.xml index bb6b9071d95..1f64ba03edf 100644 --- a/app/code/core/Mage/Log/etc/system.xml +++ b/app/code/core/Mage/Log/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php b/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php index 28fa4365a63..c8179274ed3 100644 --- a/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php index 7104948464d..a010f0ab295 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php index bcf0ecd4c44..27a92ac0b51 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->run(" diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php index 4ce0af43410..13645c043c1 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->run(" diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php index 353ac9a6953..48494b002e0 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addKey($installer->getTable('log/customer'), 'IDX_VISITOR', 'visitor_id'); $installer->getConnection()->addKey($installer->getTable('log/url_table'), 'PRIMARY', 'url_id', 'primary'); $installer->getConnection()->addKey($installer->getTable('log/url_table'), 'IDX_VISITOR', 'visitor_id'); + $installer->endSetup(); diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php index 896ae9c6a3c..d21b19bf65e 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('log_visitor_online')}` ( `visitor_id` bigint(20) unsigned NOT NULL auto_increment, @@ -37,4 +38,5 @@ KEY `IDX_CUSTOMER` (`customer_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php index afcc8093358..c1c6743bd1d 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->modifyColumn($installer->getTable('log/visitor_online'), 'remote_addr', 'bigint(20) NOT NULL'); $installer->endSetup(); diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php index a7bee4cc2d5..19a66a0177c 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 433f4314409..31493a2e330 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php index 33770c69fde..dd45ca39e7f 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.0.0-1.6.1.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.1.0-1.6.1.1.php b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.1.0-1.6.1.1.php index 3264bd1086b..1f226869419 100644 --- a/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.1.0-1.6.1.1.php +++ b/app/code/core/Mage/Log/sql/log_setup/mysql4-upgrade-1.6.1.0-1.6.1.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Media/Helper/Data.php b/app/code/core/Mage/Media/Helper/Data.php index 356211d0abc..ac65fba8c95 100644 --- a/app/code/core/Mage/Media/Helper/Data.php +++ b/app/code/core/Mage/Media/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Media - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,4 +28,5 @@ */ class Mage_Media_Helper_Data extends Mage_Core_Helper_Data { + protected $_moduleName = 'Mage_Media'; } diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index e63cb3faef4..99978d54f43 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Media - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +29,7 @@ class Mage_Media_Model_File_Image extends Mage_Core_Model_Resource_Abstract { /** - * Resource initialization + * @return $this */ protected function _construct() { @@ -36,7 +37,7 @@ protected function _construct() } /** - * Retrieve connection for read data + * @return Varien_Db_Adapter_Interface|false */ protected function _getReadAdapter() { @@ -44,7 +45,7 @@ protected function _getReadAdapter() } /** - * Retrieve connection for write data + * @return Varien_Db_Adapter_Interface|false */ protected function _getWriteAdapter() { @@ -118,7 +119,7 @@ public function getImage(Mage_Media_Model_Image $object) * Create tmp image resource for operations * * @param Mage_Media_Model_Image $object - * @return false|resource + * @return resource */ public function getTmpImage(Mage_Media_Model_Image $object) { diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php index 91ca628052e..cb9d9c4e4c0 100644 --- a/app/code/core/Mage/Media/Model/Image.php +++ b/app/code/core/Mage/Media/Model/Image.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Media - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -216,11 +217,7 @@ public function setParam($param, $value = null) */ public function getParam($param) { - if (isset($this->_params[$param])) { - return $this->_params[$param]; - } - - return null; + return $this->_params[$param] ?? null; } /** diff --git a/app/code/core/Mage/Media/Model/Image/Config/Interface.php b/app/code/core/Mage/Media/Model/Image/Config/Interface.php index f55b0800dd8..a2336f402ad 100644 --- a/app/code/core/Mage/Media/Model/Image/Config/Interface.php +++ b/app/code/core/Mage/Media/Model/Image/Config/Interface.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Media - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) - * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Media + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Media - * @author Magento Core Team + * @author Magento Core Team */ interface Mage_Media_Model_Image_Config_Interface { - /** * Retrieve base url for media files * diff --git a/app/code/core/Mage/Media/etc/config.xml b/app/code/core/Mage/Media/etc/config.xml index 6d9efe8e250..19e0a8e4837 100644 --- a/app/code/core/Mage/Media/etc/config.xml +++ b/app/code/core/Mage/Media/etc/config.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_Media - * @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_Media + * @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/Newsletter/Block/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Subscribe.php index 0bbdb9d33f9..c03ff67a2d9 100644 --- a/app/code/core/Mage/Newsletter/Block/Subscribe.php +++ b/app/code/core/Mage/Newsletter/Block/Subscribe.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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/Helper/Data.php b/app/code/core/Mage/Newsletter/Helper/Data.php index 296684254eb..95fc1681b3c 100644 --- a/app/code/core/Mage/Newsletter/Helper/Data.php +++ b/app/code/core/Mage/Newsletter/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,6 +30,8 @@ class Mage_Newsletter_Helper_Data extends Mage_Core_Helper_Abstract { const XML_PATH_TEMPLATE_FILTER = 'global/newsletter/tempate_filter'; + protected $_moduleName = 'Mage_Newsletter'; + /** * Retrieve subsription confirmation url * diff --git a/app/code/core/Mage/Newsletter/Model/Message.php b/app/code/core/Mage/Newsletter/Model/Message.php index 05809faa19a..7fac247174f 100644 --- a/app/code/core/Mage/Newsletter/Model/Message.php +++ b/app/code/core/Mage/Newsletter/Model/Message.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,10 +24,8 @@ * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Newsletter_Model_Message extends Mage_Core_Model_Message { - } diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php index f1f9626a900..b89b5557eac 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Mage newsletter problem resource model * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team * @deprecated */ class Mage_Newsletter_Model_Mysql4_Problem extends Mage_Newsletter_Model_Resource_Problem diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php index 636a1df1590..350f55add6b 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Problem/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php index a69c7bab704..016246b8e4c 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Newsletter queue saver * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team * @deprecated */ class Mage_Newsletter_Model_Mysql4_Queue extends Mage_Newsletter_Model_Resource_Queue diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php index bfed3bec06f..ace94e463b7 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Queue/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php index aad6c61f88d..e5f6d837d1c 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php index c3904705e57..1d93fced983 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Subscriber/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php index db29f26b37d..9b95a7a2ea5 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php index d03ae2c0154..8d16193fd08 100644 --- a/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Mysql4/Template/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Observer.php b/app/code/core/Mage/Newsletter/Model/Observer.php index 0e27419efee..bbf1eb5e7fb 100644 --- a/app/code/core/Mage/Newsletter/Model/Observer.php +++ b/app/code/core/Mage/Newsletter/Model/Observer.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Newsletter module observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team */ class Mage_Newsletter_Model_Observer { diff --git a/app/code/core/Mage/Newsletter/Model/Problem.php b/app/code/core/Mage/Newsletter/Model/Problem.php index db4330a8d8e..ca9f98611cf 100644 --- a/app/code/core/Mage/Newsletter/Model/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Problem.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Newsletter problem model * + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team + * * @method Mage_Newsletter_Model_Resource_Problem _getResource() * @method Mage_Newsletter_Model_Resource_Problem getResource() * @method int getCustomerId() @@ -35,10 +40,6 @@ * @method $this setProblemErrorText(string $value) * @method int getSubscriberId() * @method $this setSubscriberId(int $value) - * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team */ class Mage_Newsletter_Model_Problem extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Newsletter/Model/Queue.php b/app/code/core/Mage/Newsletter/Model/Queue.php index d4894351f86..ec572a560d4 100644 --- a/app/code/core/Mage/Newsletter/Model/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Queue.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Newsletter queue model. * + * @category Mage + * @package Mage_Newsletter + * @author Magento Core Team + * * @method Mage_Newsletter_Model_Resource_Queue _getResource() * @method Mage_Newsletter_Model_Resource_Queue getResource() * @method Mage_Newsletter_Model_Resource_Queue_Collection getCollection() @@ -45,10 +50,6 @@ * @method $this setQueueStartAt(string $value) * @method string getQueueFinishAt() * @method $this setQueueFinishAt(string $value) - * - * @category Mage - * @package Mage_Newsletter - * @author Magento Core Team */ class Mage_Newsletter_Model_Queue extends Mage_Core_Model_Template { @@ -68,7 +69,7 @@ class Mage_Newsletter_Model_Queue extends Mage_Core_Model_Template /** * save template flag * - * @var boolean + * @var bool * @deprecated since 1.4.0.1 */ protected $_saveTemplateFlag = false; @@ -76,7 +77,7 @@ class Mage_Newsletter_Model_Queue extends Mage_Core_Model_Template /** * Save stores flag. * - * @var boolean + * @var bool */ protected $_saveStoresFlag = false; @@ -93,9 +94,6 @@ class Mage_Newsletter_Model_Queue extends Mage_Core_Model_Template const STATUS_SENT = 3; const STATUS_PAUSE = 4; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('newsletter/queue'); @@ -104,7 +102,7 @@ protected function _construct() /** * Return: is this queue newly created or not. * - * @return boolean + * @return bool */ public function isNew() { @@ -270,20 +268,20 @@ public function addSubscribersToQueue(array $subscriberIds) /** * Setter for save template flag. * - * @param boolean|integer|string $value + * @param bool|int|string $value * @return $this * @deprecated since 1.4.0.1 */ public function setSaveTemplateFlag($value) { - $this->_saveTemplateFlag = (boolean)$value; + $this->_saveTemplateFlag = (bool)$value; return $this; } /** * Getter for save template flag. * - * @return boolean + * @return bool * @deprecated since 1.4.0.1 */ public function getSaveTemplateFlag() @@ -294,19 +292,19 @@ public function getSaveTemplateFlag() /** * Setter for save stores flag. * - * @param boolean|integer|string $value + * @param bool|int|string $value * @return $this */ public function setSaveStoresFlag($value) { - $this->_saveStoresFlag = (boolean)$value; + $this->_saveStoresFlag = (bool)$value; return $this; } /** * Getter for save stores flag. * - * @return boolean + * @return bool */ public function getSaveStoresFlag() { diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Problem.php b/app/code/core/Mage/Newsletter/Model/Resource/Problem.php index 7e87b451c92..05690abea0b 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Problem.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Problem.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Newsletter problem 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_Problem extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Define main table - * - */ protected function _construct() { $this->_init('newsletter/problem', 'problem_id'); diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php index 6ee7ceb41c1..8064f6775e1 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Problem/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php index b02deba9e8b..2573af9c137 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Newsletter queue 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_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/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php index de63677061b..ce16ac016bc 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php index 95caa563513..efc98ffe565 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +57,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..1bd38637b76 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,14 +45,14 @@ class Mage_Newsletter_Model_Resource_Subscriber_Collection extends Mage_Core_Mod /** * Queue joined flag * - * @var boolean + * @var bool */ protected $_queueJoinedFlag = false; /** * Flag that indicates apply of customers info on load * - * @var boolean + * @var bool */ protected $_showCustomersInfo = false; @@ -62,11 +63,6 @@ class Mage_Newsletter_Model_Resource_Subscriber_Collection extends Mage_Core_Mod */ protected $_countFilterPart = []; - /** - * Constructor - * Configures collection - * - */ protected function _construct() { parent::_construct(); @@ -206,16 +202,13 @@ public function _getFieldTableAlias($field) /** * Returns select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { - $select = parent::getSelectCountSql(); $countSelect = clone $this->getSelect(); - $countSelect->reset(Zend_Db_Select::HAVING); - return $select; } diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template.php b/app/code/core/Mage/Newsletter/Model/Resource/Template.php index 1fefbca6757..fb8e0b0245a 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -65,7 +62,7 @@ public function loadByCode(Mage_Newsletter_Model_Template $object, $templateCode * Check usage of template in queue * * @param Mage_Newsletter_Model_Template $template - * @return boolean + * @return bool */ public function checkUsageInQueue(Mage_Newsletter_Model_Template $template) { @@ -88,7 +85,7 @@ public function checkUsageInQueue(Mage_Newsletter_Model_Template $template) * Check usage of template code in other templates * * @param Mage_Newsletter_Model_Template $template - * @return boolean + * @return bool */ public function checkCodeUsage(Mage_Newsletter_Model_Template $template) { diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php index f88a364a45a..52995e121a5 100644 --- a/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php +++ b/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/Model/Session.php b/app/code/core/Mage/Newsletter/Model/Session.php index aa27b695f5e..eebfc9aa305 100644 --- a/app/code/core/Mage/Newsletter/Model/Session.php +++ b/app/code/core/Mage/Newsletter/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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..df7decffd01 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +50,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 +95,6 @@ class Mage_Newsletter_Model_Subscriber extends Mage_Core_Model_Abstract */ protected $_isStatusChanged = false; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('newsletter/subscriber'); @@ -188,7 +186,7 @@ public function setStatus($value) /** * Set the error messages scope for subscription * - * @param boolean $scope + * @param bool $scope * @return $this */ @@ -222,19 +220,19 @@ public function setEmail($value) /** * Set for status change flag * - * @param boolean $value + * @param bool $value * @return $this */ public function setIsStatusChanged($value) { - $this->_isStatusChanged = (boolean) $value; + $this->_isStatusChanged = (bool) $value; return $this; } /** * Return status change flag value * - * @return boolean + * @return bool */ public function getIsStatusChanged() { @@ -361,20 +359,16 @@ public function subscribe($email) $this->setIsStatusChanged(true); - try { - $this->save(); - if ($isConfirmNeed === true - && $isOwnSubscribes === false - ) { - $this->sendConfirmationRequestEmail(); - } else { - $this->sendConfirmationSuccessEmail(); - } - - return $this->getStatus(); - } catch (Exception $e) { - throw new Exception($e->getMessage()); + $this->save(); + if ($isConfirmNeed === true + && $isOwnSubscribes === false + ) { + $this->sendConfirmationRequestEmail(); + } else { + $this->sendConfirmationSuccessEmail(); } + + return $this->getStatus(); } /** @@ -478,7 +472,7 @@ public function subscribeCustomer($customer) * Confirms subscriber newsletter * * @param string $code - * @return boolean + * @return bool */ public function confirm($code) { diff --git a/app/code/core/Mage/Newsletter/Model/Template.php b/app/code/core/Mage/Newsletter/Model/Template.php index f3584242fdf..7ca69d6085c 100644 --- a/app/code/core/Mage/Newsletter/Model/Template.php +++ b/app/code/core/Mage/Newsletter/Model/Template.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +52,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 { @@ -138,7 +139,7 @@ public function loadByCode($templateCode) /** * Return true if this template can be used for sending queue as main template * - * @return boolean + * @return bool * @deprecated since 1.4.0.1 */ public function isValidForSend() @@ -287,7 +288,7 @@ public function getMail() * @param array $variables template variables * @param string|null $name receiver name (if subscriber model not specified) * @param Mage_Newsletter_Model_Queue|null $queue queue model, used for problems reporting. - * @return boolean + * @return bool * @deprecated since 1.4.0.1 **/ public function send($subscriber, array $variables = [], $name = null, Mage_Newsletter_Model_Queue $queue = null) diff --git a/app/code/core/Mage/Newsletter/Model/Template/Filter.php b/app/code/core/Mage/Newsletter/Model/Template/Filter.php index a0d7dc21ff4..78e7b916c39 100644 --- a/app/code/core/Mage/Newsletter/Model/Template/Filter.php +++ b/app/code/core/Mage/Newsletter/Model/Template/Filter.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/controllers/ManageController.php b/app/code/core/Mage/Newsletter/controllers/ManageController.php index 3389b7239b6..ee764137bb4 100644 --- a/app/code/core/Mage/Newsletter/controllers/ManageController.php +++ b/app/code/core/Mage/Newsletter/controllers/ManageController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Newsletter_ManageController extends Mage_Core_Controller_Front_Action { @@ -38,6 +39,7 @@ public function preDispatch() if (!Mage::getSingleton('customer/session')->authenticate($this)) { $this->setFlag('', 'no-dispatch', true); } + return $this; } public function indexAction() @@ -64,9 +66,9 @@ public function saveAction() try { Mage::getSingleton('customer/session')->getCustomer() ->setStoreId(Mage::app()->getStore()->getId()) - ->setIsSubscribed((boolean)$this->getRequest()->getParam('is_subscribed', false)) + ->setIsSubscribed((bool)$this->getRequest()->getParam('is_subscribed', false)) ->save(); - if ((boolean)$this->getRequest()->getParam('is_subscribed', false)) { + if ((bool)$this->getRequest()->getParam('is_subscribed', false)) { Mage::getSingleton('customer/session')->addSuccess($this->__('The subscription has been saved.')); } else { Mage::getSingleton('customer/session')->addSuccess($this->__('The subscription has been removed.')); diff --git a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php index a2874dc7265..c29b205cac4 100644 --- a/app/code/core/Mage/Newsletter/controllers/SubscriberController.php +++ b/app/code/core/Mage/Newsletter/controllers/SubscriberController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php index 9a3659e936d..a8d8a11ecd7 100644 --- a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.0-1.6.0.1.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php index 3bece6c9dfd..e10220f3476 100644 --- a/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php +++ b/app/code/core/Mage/Newsletter/data/newsletter_setup/data-upgrade-1.6.0.1-1.6.0.2.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/etc/adminhtml.xml b/app/code/core/Mage/Newsletter/etc/adminhtml.xml index d8ee105be67..98433edaf7b 100644 --- a/app/code/core/Mage/Newsletter/etc/adminhtml.xml +++ b/app/code/core/Mage/Newsletter/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 18801338636..60619a5e436 100644 --- a/app/code/core/Mage/Newsletter/etc/config.xml +++ b/app/code/core/Mage/Newsletter/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7b847be27e4 100644 --- a/app/code/core/Mage/Newsletter/etc/system.xml +++ b/app/code/core/Mage/Newsletter/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php index 2d268909c31..b9645e3e8d1 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php index 05af27a913e..036f3d39fc4 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php index 039d8f5f7fb..f76e2f7d0f7 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-install-0.8.0.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Newsletter install - * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ +/** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('newsletter_problem')}`; CREATE TABLE `{$installer->getTable('newsletter_problem')}` ( diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php index c5bf0c8b687..70e94e1ce16 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php index 8e27db9ab35..8ec3cca77be 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -7,32 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Newsletter - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $installer->startSetup(); $table = $installer->getTable('newsletter_queue_link'); - $installer->getConnection()->addKey($table, 'IDX_NEWSLETTER_QUEUE_LINK_SEND_AT', ['queue_id', 'letter_sent_at']); $installer->endSetup(); diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php index eb486ec7886..e99bc3c1809 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -7,23 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn( $installer->getTable('newsletter_template'), 'template_styles', "text AFTER `template_text_preprocessed`" ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php index c856aeee30a..6f4ae91979f 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; + $queueTable = $installer->getTable('newsletter_queue'); $templateTable = $installer->getTable('newsletter_template'); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index cdd5f633888..b3a23b18813 100644 --- a/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Newsletter/sql/newsletter_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Newsletter + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Oauth/Block/Adminhtml/Oauth/Admin/Token.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token.php index c8253e03ae8..fa51ec601b5 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php index 089c106c45d..d40c381c012 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Admin/Token/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php index 0f11db20b7e..223a9971aa9 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php index 71e2a13acb3..6aa68ca8bc4 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Authorize/Button.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php index 3134ec5cb48..638244245b2 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php index 58708d3dfd5..41594368b45 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/AuthorizedTokens/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -197,14 +198,14 @@ public function decorateUserType($value, $row, $column, $isExport) */ public function decorateUserId($value, $row, $column, $isExport) { - $value = ($row->getCustomerId()) ?$row->getCustomerId() :$row->getAdminId(); + $value = $row->getCustomerId() ? $row->getCustomerId() : $row->getAdminId(); return $value; } /** * Check admin permissions * - * @return boolean + * @return bool */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php index ee958f2816f..71909b903eb 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php index 873e31ee345..5162166a119 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php index 7cc3f0329ac..e52502dadce 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php index 4b22ec8d84f..e9242ca6797 100644 --- a/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php +++ b/app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Oauth/Block/Authorize.php index 304e3d1aff3..1d7ca02e829 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize.php +++ b/app/code/core/Mage/Oauth/Block/Authorize.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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..875a5b89de2 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,14 +28,14 @@ * * @method string getToken() * @method Mage_Oauth_Block_AuthorizeBaseAbstract setToken() setToken(string $token) - * @method boolean getIsSimple() - * @method Mage_Oauth_Block_Authorize_Button setIsSimple() setIsSimple(boolean $flag) - * @method boolean getHasException() - * @method Mage_Oauth_Block_AuthorizeBaseAbstract setIsException() setHasException(boolean $flag) - * @method boolean getVerifier() + * @method bool getIsSimple() + * @method Mage_Oauth_Block_Authorize_Button setIsSimple() setIsSimple(bool $flag) + * @method bool getHasException() + * @method Mage_Oauth_Block_AuthorizeBaseAbstract setIsException() setHasException(bool $flag) + * @method bool getVerifier() * @method Mage_Oauth_Block_AuthorizeBaseAbstract setVerifier() setVerifier(string $verifier) - * @method boolean getIsLogged() - * @method Mage_Oauth_Block_AuthorizeBaseAbstract setIsLogged() setIsLogged(boolean $flag) + * @method bool getIsLogged() + * @method Mage_Oauth_Block_AuthorizeBaseAbstract setIsLogged() setIsLogged(bool $flag) */ abstract class Mage_Oauth_Block_Authorize_Abstract extends Mage_Core_Block_Template { @@ -52,9 +53,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/Block/Authorize/Button.php b/app/code/core/Mage/Oauth/Block/Authorize/Button.php index 61a889c7f4e..6d11f8befb1 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/Button.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/Button.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/ButtonBaseAbstract.php b/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php index e5f34b6cdd6..6d5554a9802 100644 --- a/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php +++ b/app/code/core/Mage/Oauth/Block/Authorize/ButtonBaseAbstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php b/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php index b4ece0b11c9..f3ee031029b 100644 --- a/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php +++ b/app/code/core/Mage/Oauth/Block/AuthorizeBaseAbstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Block/Customer/Token/List.php b/app/code/core/Mage/Oauth/Block/Customer/Token/List.php index a0323a31efa..96056adfaef 100644 --- a/app/code/core/Mage/Oauth/Block/Customer/Token/List.php +++ b/app/code/core/Mage/Oauth/Block/Customer/Token/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Oauth/Exception.php b/app/code/core/Mage/Oauth/Exception.php index 02987ff6537..5a66770c587 100644 --- a/app/code/core/Mage/Oauth/Exception.php +++ b/app/code/core/Mage/Oauth/Exception.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Helper/Data.php b/app/code/core/Mage/Oauth/Helper/Data.php index e4356ea137c..ed041543b7d 100644 --- a/app/code/core/Mage/Oauth/Helper/Data.php +++ b/app/code/core/Mage/Oauth/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,6 +61,8 @@ class Mage_Oauth_Helper_Data extends Mage_Core_Helper_Abstract */ const QUERY_PARAM_REJECTED = 'rejected'; + protected $_moduleName = 'Mage_Oauth'; + /** * Available endpoints list * @@ -250,7 +253,7 @@ public function sendNotificationOnTokenStatusChange($userEmail, $userName, $appl /** * Is current authorize page is simple * - * @return boolean + * @return bool */ protected function _getIsSimple() { diff --git a/app/code/core/Mage/Oauth/Model/Consumer.php b/app/code/core/Mage/Oauth/Model/Consumer.php index 3af9dbae8ee..6e981263682 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Consumer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,9 +57,6 @@ class Mage_Oauth_Model_Consumer extends Mage_Core_Model_Abstract */ const SECRET_LENGTH = 32; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('oauth/consumer'); diff --git a/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php b/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php index 114701ebf7b..1c4bfb6dd23 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php +++ b/app/code/core/Mage/Oauth/Model/Consumer/Validator/KeyLength.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,7 +38,7 @@ class Mage_Oauth_Model_Consumer_Validator_KeyLength extends Zend_Validate_String /** * Sets validator options * - * @param integer|array|Zend_Config $options + * @param int|array|Zend_Config $options */ public function __construct($options = []) { @@ -116,7 +117,7 @@ public function getLength() * no greater than the max option (when the max option is not null). * * @param string $value - * @return boolean + * @return bool */ public function isValid($value) { diff --git a/app/code/core/Mage/Oauth/Model/Nonce.php b/app/code/core/Mage/Oauth/Model/Nonce.php index 0a9deebaec7..c9d8d90a23d 100644 --- a/app/code/core/Mage/Oauth/Model/Nonce.php +++ b/app/code/core/Mage/Oauth/Model/Nonce.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * oAuth nonce model * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team + * * @method string getNonce() * @method Mage_Oauth_Model_Nonce setNonce() setNonce(string $nonce) * @method string getTimestamp() @@ -33,9 +35,6 @@ */ class Mage_Oauth_Model_Nonce extends Mage_Core_Model_Abstract { - /** - * Initialize resource model - */ protected function _construct() { $this->_init('oauth/nonce'); diff --git a/app/code/core/Mage/Oauth/Model/Observer.php b/app/code/core/Mage/Oauth/Model/Observer.php index 940cce9fd2c..fb471727135 100644 --- a/app/code/core/Mage/Oauth/Model/Observer.php +++ b/app/code/core/Mage/Oauth/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * OAuth observer * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Model_Observer { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Consumer.php b/app/code/core/Mage/Oauth/Model/Resource/Consumer.php index e2ce38f6d7c..05b613634c5 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Consumer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Oauth_Model_Resource_Consumer extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize resource model - */ protected function _construct() { $this->_init('oauth/consumer', 'entity_id'); diff --git a/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php index f55a9b84eae..875ca6f05c5 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Nonce.php b/app/code/core/Mage/Oauth/Model/Resource/Nonce.php index 3aae16c7825..15686784ebb 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Nonce.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Nonce.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * oAuth nonce 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_Nonce extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Initialize resource model - */ protected function _construct() { $this->_init('oauth/nonce', null); diff --git a/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php index 1353024fac4..50b9fa83c3c 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Resource/Setup.php b/app/code/core/Mage/Oauth/Model/Resource/Setup.php index 5d8217dd5da..d3afc656676 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Setup.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Setup.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..7c55b4e660f 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Resource/Token/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php index ce4e42f67fb..c9a8245f008 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php index 67be986b2a5..bc1b66860a2 100644 --- a/app/code/core/Mage/Oauth/Model/Server.php +++ b/app/code/core/Mage/Oauth/Model/Server.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * oAuth Server * - * @category Mage - * @package Mage_Oauth - * @author Magento Core Team + * @category Mage + * @package Mage_Oauth + * @author Magento Core Team */ class Mage_Oauth_Model_Server { @@ -287,8 +288,6 @@ protected function _getResponse() /** * Initialize consumer - * - * @throws Mage_Oauth_Exception */ protected function _initConsumer() { @@ -305,7 +304,6 @@ protected function _initConsumer() * Load token object, validate it depending on request type, set access data and save * * @return $this - * @throws Mage_Oauth_Exception */ protected function _initToken() { @@ -426,7 +424,6 @@ protected function _saveToken() * * @param string $message Exception message * @param int $code Exception code - * @throws Mage_Oauth_Exception */ protected function _throwException($message = '', $code = 0) { @@ -479,8 +476,6 @@ protected function _validateNonce($nonce, $timestamp) /** * Validate protocol parameters - * - * @throws Mage_Oauth_Exception */ protected function _validateProtocolParams() { @@ -522,8 +517,6 @@ protected function _validateProtocolParams() /** * Validate signature - * - * @throws Mage_Oauth_Exception */ protected function _validateSignature() { @@ -665,8 +658,9 @@ public function initiateToken() * Create response string for problem during request and set HTTP error code * * @param Exception $e - * @param Zend_Controller_Response_Http $response OPTIONAL If NULL - will use internal getter + * @param Zend_Controller_Response_Http|null $response OPTIONAL If NULL - will use internal getter * @return string + * @throws Zend_Controller_Response_Exception */ public function reportProblem(Exception $e, Zend_Controller_Response_Http $response = null) { diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php index 470d4907e80..38057d15a33 100644 --- a/app/code/core/Mage/Oauth/Model/Token.php +++ b/app/code/core/Mage/Oauth/Model/Token.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6a1f028c1e0 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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/Adminhtml/Oauth/AuthorizeController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php index c35a7c7da1d..dc10cfb32c3 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizeController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -244,7 +245,7 @@ protected function _initRejectPage($simple = false) * Check is login data has empty login or pass * See Mage_Admin_Model_Session: there is no any error message if login or password is empty * - * @return boolean + * @return bool */ protected function _checkLoginIsEmpty() { @@ -252,8 +253,8 @@ protected function _checkLoginIsEmpty() $action = $this->getRequest()->getActionName(); if (($action == 'index' || $action == 'simple') && $this->getRequest()->getPost('login')) { $postLogin = $this->getRequest()->getPost('login'); - $username = isset($postLogin['username']) ? $postLogin['username'] : ''; - $password = isset($postLogin['password']) ? $postLogin['password'] : ''; + $username = $postLogin['username'] ?? ''; + $password = $postLogin['password'] ?? ''; if (empty($username) || empty($password)) { $error = true; } diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php index 1a1564da433..618abd54420 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php index 969f7d32904..c346de8719f 100644 --- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php +++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/AuthorizeController.php b/app/code/core/Mage/Oauth/controllers/AuthorizeController.php index 7a71f0e867c..2df7647ba6d 100644 --- a/app/code/core/Mage/Oauth/controllers/AuthorizeController.php +++ b/app/code/core/Mage/Oauth/controllers/AuthorizeController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php index 9267e46ed2a..24f08e1a9cb 100644 --- a/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/Customer/TokenController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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 { @@ -55,6 +56,7 @@ public function preDispatch() if (!$this->_session->authenticate($this)) { $this->setFlag('', self::FLAG_NO_DISPATCH, true); } + return $this; } /** diff --git a/app/code/core/Mage/Oauth/controllers/InitiateController.php b/app/code/core/Mage/Oauth/controllers/InitiateController.php index a396bff3efd..f8e8d8a0d5c 100644 --- a/app/code/core/Mage/Oauth/controllers/InitiateController.php +++ b/app/code/core/Mage/Oauth/controllers/InitiateController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Oauth/controllers/TokenController.php b/app/code/core/Mage/Oauth/controllers/TokenController.php index 09d009694a6..d004f5b0fc2 100644 --- a/app/code/core/Mage/Oauth/controllers/TokenController.php +++ b/app/code/core/Mage/Oauth/controllers/TokenController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Oauth + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 79164074b09..35c04387ed8 100644 --- a/app/code/core/Mage/Oauth/etc/adminhtml.xml +++ b/app/code/core/Mage/Oauth/etc/adminhtml.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. (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/Oauth/etc/config.xml b/app/code/core/Mage/Oauth/etc/config.xml index 20960766ec8..8e4039771de 100644 --- a/app/code/core/Mage/Oauth/etc/config.xml +++ b/app/code/core/Mage/Oauth/etc/config.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. (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/Oauth/etc/system.xml b/app/code/core/Mage/Oauth/etc/system.xml index ee0c5021f7f..1358dfa3e7c 100644 --- a/app/code/core/Mage/Oauth/etc/system.xml +++ b/app/code/core/Mage/Oauth/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php b/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php index e49bd73888e..8af95b5db94 100644 --- a/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Oauth/sql/oauth_setup/install-1.0.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Page/Block/Html.php index deee4a7027b..396ddce8349 100644 --- a/app/code/core/Mage/Page/Block/Html.php +++ b/app/code/core/Mage/Page/Block/Html.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Breadcrumbs.php b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php index 0e06f758838..dbea5ad4430 100644 --- a/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php +++ b/app/code/core/Mage/Page/Block/Html/Breadcrumbs.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @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/CookieNotice.php b/app/code/core/Mage/Page/Block/Html/CookieNotice.php index 859a8eb4963..f60bba3f870 100644 --- a/app/code/core/Mage/Page/Block/Html/CookieNotice.php +++ b/app/code/core/Mage/Page/Block/Html/CookieNotice.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Footer.php b/app/code/core/Mage/Page/Block/Html/Footer.php index b5cdb519899..87bca18cba8 100644 --- a/app/code/core/Mage/Page/Block/Html/Footer.php +++ b/app/code/core/Mage/Page/Block/Html/Footer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -84,7 +85,7 @@ public function getCopyright() * Retrieve child block HTML, sorted by default * * @param string $name - * @param boolean $useCache + * @param bool $useCache * @param bool $sorted * @return string */ diff --git a/app/code/core/Mage/Page/Block/Html/Head.php b/app/code/core/Mage/Page/Block/Html/Head.php index 918bfb7e2c9..93dbeebe976 100644 --- a/app/code/core/Mage/Page/Block/Html/Head.php +++ b/app/code/core/Mage/Page/Block/Html/Head.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Html/Header.php b/app/code/core/Mage/Page/Block/Html/Header.php index 1fb96206193..51fd6fec7cd 100644 --- a/app/code/core/Mage/Page/Block/Html/Header.php +++ b/app/code/core/Mage/Page/Block/Html/Header.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Notices.php b/app/code/core/Mage/Page/Block/Html/Notices.php index 0b6364748a1..5e2aaf3978a 100644 --- a/app/code/core/Mage/Page/Block/Html/Notices.php +++ b/app/code/core/Mage/Page/Block/Html/Notices.php @@ -7,30 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Html notices block * - * @category Mage - * @package Mage_Page - * @author Magento Core Team + * @category Mage + * @package Mage_Page + * @author Magento Core Team */ class Mage_Page_Block_Html_Notices extends Mage_Core_Block_Template { /** * Check if noscript notice should be displayed * - * @return boolean + * @return bool */ public function displayNoscriptNotice() { @@ -40,7 +41,7 @@ public function displayNoscriptNotice() /** * Check if demo store notice should be displayed * - * @return boolean + * @return bool */ public function displayDemoNotice() { diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php index 3c6cfb14725..595e7ca81cf 100644 --- a/app/code/core/Mage/Page/Block/Html/Pager.php +++ b/app/code/core/Mage/Page/Block/Html/Pager.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Page - * @author Magento Core Team - * - * @todo separate order, mode and pager + * @author Magento Core Team + * @todo Separate order, mode and pager */ class Mage_Page_Block_Html_Pager extends Mage_Core_Block_Template { @@ -422,7 +422,7 @@ public function getFramePages() /** * Return page number of Previous jump * - * @return int + * @return int|null */ public function getPreviousJumpPage() { @@ -450,7 +450,7 @@ public function getPreviousJumpUrl() /** * Return page number of Next jump * - * @return int + * @return int|null */ public function getNextJumpPage() { diff --git a/app/code/core/Mage/Page/Block/Html/Toplinks.php b/app/code/core/Mage/Page/Block/Html/Toplinks.php index 9a08d8f0e73..aab8a454a98 100644 --- a/app/code/core/Mage/Page/Block/Html/Toplinks.php +++ b/app/code/core/Mage/Page/Block/Html/Toplinks.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..a5a86f06793 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php index 6ff6c064461..c3e89e99961 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Top menu block item renderer * - * @category Mage - * @package Mage_Page - * @author Magento Core Team + * @category Mage + * @package Mage_Page + * @author Magento Core Team * * @method Varien_Data_Tree_Node getMenuTree() * @method string getChildrenWrapClass() diff --git a/app/code/core/Mage/Page/Block/Html/Welcome.php b/app/code/core/Mage/Page/Block/Html/Welcome.php index 685cf3dff7f..e6074b5c65e 100644 --- a/app/code/core/Mage/Page/Block/Html/Welcome.php +++ b/app/code/core/Mage/Page/Block/Html/Welcome.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..9bce7740b02 100644 --- a/app/code/core/Mage/Page/Block/Html/Wrapper.php +++ b/app/code/core/Mage/Page/Block/Html/Wrapper.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Cookie.php b/app/code/core/Mage/Page/Block/Js/Cookie.php index 51a5f0f01c5..7f56bf209de 100644 --- a/app/code/core/Mage/Page/Block/Js/Cookie.php +++ b/app/code/core/Mage/Page/Block/Js/Cookie.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Page/Block/Js/Translate.php b/app/code/core/Mage/Page/Block/Js/Translate.php index 880b51b6325..dbccd3d25e7 100644 --- a/app/code/core/Mage/Page/Block/Js/Translate.php +++ b/app/code/core/Mage/Page/Block/Js/Translate.php @@ -7,22 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Redirect.php b/app/code/core/Mage/Page/Block/Redirect.php index c1a72ec43e4..821e4a3f1a8 100644 --- a/app/code/core/Mage/Page/Block/Redirect.php +++ b/app/code/core/Mage/Page/Block/Redirect.php @@ -7,29 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Customer Redirect Page * - * @category Mage - * @package Mage_Page - * @author Magento Core Team + * @category Mage + * @package Mage_Page + * @author Magento Core Team * * @method string getMethod() */ class Mage_Page_Block_Redirect extends Mage_Core_Block_Template { - /** * HTML form hidden fields */ @@ -104,9 +104,9 @@ public function getHtmlFormRedirect() } /** - * HTML form or JS redirect + * HTML form or JS redirect * - * @return boolean + * @return bool */ public function isHtmlFormRedirect() { diff --git a/app/code/core/Mage/Page/Block/Switch.php b/app/code/core/Mage/Page/Block/Switch.php index 80d12a39e64..f212339985b 100644 --- a/app/code/core/Mage/Page/Block/Switch.php +++ b/app/code/core/Mage/Page/Block/Switch.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Store and language switcher block * * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @package Mage_Page + * @author Magento Core Team */ class Mage_Page_Block_Switch extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Page/Block/Template/Container.php b/app/code/core/Mage/Page/Block/Template/Container.php index 661d7b142c4..a7169bc970e 100644 --- a/app/code/core/Mage/Page/Block/Template/Container.php +++ b/app/code/core/Mage/Page/Block/Template/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Abstract container block with header * * @category Mage - * @package Mage_Core + * @package Mage_Page * @author Magento Core Team */ class Mage_Page_Block_Template_Container extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php index bb3e84f1dcf..036017d9a9c 100644 --- a/app/code/core/Mage/Page/Block/Template/Links.php +++ b/app/code/core/Mage/Page/Block/Template/Links.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Simple links list block * * @category Mage - * @package Mage_Core - * @author Magento Core Team + * @package Mage_Page + * @author Magento Core Team */ class Mage_Page_Block_Template_Links extends Mage_Core_Block_Template { @@ -66,7 +67,7 @@ public function getLinks() * @param string $label * @param string $url * @param string $title - * @param boolean $prepare + * @param bool $prepare * @param array $urlParams * @param int $position * @param string|array $liParams diff --git a/app/code/core/Mage/Page/Block/Template/Links/Block.php b/app/code/core/Mage/Page/Block/Template/Links/Block.php index 3af27bcae77..738254b6f32 100644 --- a/app/code/core/Mage/Page/Block/Template/Links/Block.php +++ b/app/code/core/Mage/Page/Block/Template/Links/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Simple links list block * * @category Mage - * @package Mage_Core + * @package Mage_Page * @author Magento Core Team */ class Mage_Page_Block_Template_Links_Block extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Page/Helper/Data.php b/app/code/core/Mage/Page/Helper/Data.php index f0f0d5c626d..db67c8f31dc 100644 --- a/app/code/core/Mage/Page/Helper/Data.php +++ b/app/code/core/Mage/Page/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +25,5 @@ */ class Mage_Page_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Page'; } diff --git a/app/code/core/Mage/Page/Helper/Html.php b/app/code/core/Mage/Page/Helper/Html.php index 2047c6606df..a7f55ef3d64 100644 --- a/app/code/core/Mage/Page/Helper/Html.php +++ b/app/code/core/Mage/Page/Helper/Html.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +26,5 @@ */ class Mage_Page_Helper_Html extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Page'; } diff --git a/app/code/core/Mage/Page/Helper/Layout.php b/app/code/core/Mage/Page/Helper/Layout.php index ad37540b8e9..e1d663f3d06 100644 --- a/app/code/core/Mage/Page/Helper/Layout.php +++ b/app/code/core/Mage/Page/Helper/Layout.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,8 @@ */ class Mage_Page_Helper_Layout extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Page'; + /** * Apply page layout handle * diff --git a/app/code/core/Mage/Page/Model/Config.php b/app/code/core/Mage/Page/Model/Config.php index cda98c2849b..24da822f813 100644 --- a/app/code/core/Mage/Page/Model/Config.php +++ b/app/code/core/Mage/Page/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -99,11 +100,7 @@ public function getPageLayout($layoutCode) { $this->_initPageLayouts(); - if (isset($this->_pageLayouts[$layoutCode])) { - return $this->_pageLayouts[$layoutCode]; - } - - return false; + return $this->_pageLayouts[$layoutCode] ?? false; } /** diff --git a/app/code/core/Mage/Page/Model/Source/Layout.php b/app/code/core/Mage/Page/Model/Source/Layout.php index 0b667e38330..351d6aa4bb3 100644 --- a/app/code/core/Mage/Page/Model/Source/Layout.php +++ b/app/code/core/Mage/Page/Model/Source/Layout.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Page + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Page_Model_Source_Layout { - /** * Page layout options * diff --git a/app/code/core/Mage/Page/etc/config.xml b/app/code/core/Mage/Page/etc/config.xml index 663eb135503..154793cecc7 100644 --- a/app/code/core/Mage/Page/etc/config.xml +++ b/app/code/core/Mage/Page/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..69c5155339a 100644 --- a/app/code/core/Mage/Page/etc/system.xml +++ b/app/code/core/Mage/Page/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php index f091c8e9b69..b66072a0a0c 100644 --- a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php +++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -106,7 +107,7 @@ public function showNoticeMessage($message) /** * Return partial authorization confirmation message and unset it in payment model * - * @return string + * @return string|false */ public function getPartialAuthorizationConfirmationMessage() { diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php index aea184c9185..8654d44ccf4 100644 --- a/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php +++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Info/Cc.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Helper/Data.php b/app/code/core/Mage/Paygate/Helper/Data.php index e92877b3c19..9b5d7cea1c4 100644 --- a/app/code/core/Mage/Paygate/Helper/Data.php +++ b/app/code/core/Mage/Paygate/Helper/Data.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paygate data helper * - * @category Mage - * @package Mage_Paygate - * @author Magento Core Team + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team */ class Mage_Paygate_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Paygate'; + /** * Converts a lot of messages to message * @@ -41,12 +44,12 @@ public function convertMessagesToMessage($messages) /** * Return message for gateway transaction request * - * @param Mage_Payment_Model_Info $payment - * @param string $requestType - * @param string $lastTransactionId - * @param Varien_Object $card - * @param float $amount - * @param string $exception + * @param Mage_Payment_Model_Info $payment + * @param string $requestType + * @param string $lastTransactionId + * @param Varien_Object $card + * @param float|false $amount + * @param string|false $exception * @return bool|string */ public function getTransactionMessage($payment, $requestType, $lastTransactionId, $card, $amount = false, @@ -60,13 +63,13 @@ public function getTransactionMessage($payment, $requestType, $lastTransactionId /** * Return message for gateway transaction request * - * @param Mage_Payment_Model_Info $payment - * @param string $requestType - * @param string $lastTransactionId - * @param Varien_Object $card - * @param float $amount - * @param string $exception - * @param string $additionalMessage Custom message, which will be added to the end of generated message + * @param Mage_Payment_Model_Info $payment + * @param string $requestType + * @param string $lastTransactionId + * @param Varien_Object $card + * @param float|false $amount + * @param string|false $exception + * @param string|false $additionalMessage Custom message, which will be added to the end of generated message * @return bool|string */ public function getExtendedTransactionMessage($payment, $requestType, $lastTransactionId, $card, $amount = false, diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php index b0c92482b36..da4fd011293 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -105,22 +106,29 @@ class Mage_Paygate_Model_Authorizenet extends Mage_Payment_Model_Method_Cc protected $_canUseInternal = true; protected $_canUseCheckout = true; protected $_canUseForMultishipping = true; - protected $_canSaveCc = false; + protected $_canSaveCc = false; protected $_canFetchTransactionInfo = true; protected $_allowCurrencyCode = ['USD']; + /** + * @var Mage_Paygate_Model_Authorizenet_Cards + */ + protected $_cardsStorage; + /** * Fields that should be replaced in debug with '***' * * @var array */ - protected $_debugReplacePrivateDataKeys = ['x_login', 'x_tran_key', - 'x_card_num', 'x_exp_date', - 'x_card_code', 'x_bank_aba_code', - 'x_bank_name', 'x_bank_acct_num', - 'x_bank_acct_type','x_bank_acct_name', - 'x_echeck_type']; + protected $_debugReplacePrivateDataKeys = [ + 'x_login', 'x_tran_key', + 'x_card_num', 'x_exp_date', + 'x_card_code', 'x_bank_aba_code', + 'x_bank_name', 'x_bank_acct_num', + 'x_bank_acct_type','x_bank_acct_name', + 'x_echeck_type' + ]; /** * Key for storing fraud transaction flag in additional information of payment model @@ -186,7 +194,7 @@ class Mage_Paygate_Model_Authorizenet extends Mage_Payment_Model_Method_Cc * Check method for processing with base currency * * @param string $currencyCode - * @return boolean + * @return bool */ public function canUseForCurrency($currencyCode) { @@ -1315,7 +1323,7 @@ protected function _postRequest(Varien_Object $request) ->setCustomerId($r[12]) ->setMd5Hash($r[37]) ->setCardCodeResponseCode($r[38]) - ->setCAVVResponseCode( (isset($r[39])) ? $r[39] : null) + ->setCAVVResponseCode($r[39] ?? null) ->setSplitTenderId($r[52]) ->setAccNumber($r[50]) ->setCardType($r[51]) diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php index 97035a7f9de..335fbae50c2 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -167,7 +168,7 @@ public function getRefundedAmount() /** * Remove all cards from payment instance * - * @return Mage_Paygate_Model_Authorizenet_Cart + * @return $this */ public function flushCards() { diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php index 38bbe32e4df..3372aeec738 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Debug.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php index 1d081201979..d1431e134f4 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Request.php @@ -7,18 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - class Mage_Paygate_Model_Authorizenet_Request extends Varien_Object { - } diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php index 815a0b01c83..d04d17a1607 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Result.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team + */ class Mage_Paygate_Model_Authorizenet_Result extends Varien_Object { - } diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php index e1ac437f78b..99bf64fd45c 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/Cctype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php index 2f05cac42af..d47f9031db6 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Source/PaymentAction.php @@ -7,22 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * * Authorizenet Payment Action Dropdown source * - * @author Magento Core Team + * @category Mage + * @package Mage_Paygate + * @author Magento Core Team */ class Mage_Paygate_Model_Authorizenet_Source_PaymentAction { diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php index 1a4cd081ee4..fc50eb92b78 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php index de79e334c07..679a1b2bb0f 100644 --- a/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php +++ b/app/code/core/Mage/Paygate/Model/Mysql4/Authorizenet/Debug/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php index 1f6360157b4..e5d09110646 100644 --- a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php +++ b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php index 1be51f7d356..3356e33160b 100644 --- a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php +++ b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('paygate/authorizenet_debug'); diff --git a/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php b/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php index 1490011f49b..2d383f10455 100644 --- a/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php +++ b/app/code/core/Mage/Paygate/controllers/Adminhtml/Paygate/Authorizenet/PaymentController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php b/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php index 2d9bb161076..8de5af597e7 100644 --- a/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php +++ b/app/code/core/Mage/Paygate/controllers/Authorizenet/PaymentController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Paygate_Authorizenet_PaymentController extends Mage_Core_Controller_Front_Action { - /** * Cancel active partail authorizations */ diff --git a/app/code/core/Mage/Paygate/etc/config.xml b/app/code/core/Mage/Paygate/etc/config.xml index cd2251a9558..254098611ed 100644 --- a/app/code/core/Mage/Paygate/etc/config.xml +++ b/app/code/core/Mage/Paygate/etc/config.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. (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/Paygate/etc/system.xml b/app/code/core/Mage/Paygate/etc/system.xml index 7a793d69fe4..00c85c93285 100644 --- a/app/code/core/Mage/Paygate/etc/system.xml +++ b/app/code/core/Mage/Paygate/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php b/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php index 5f6c002d90d..b03016b52cf 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php index 6eb771b0098..23d879910b4 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-data-upgrade-0.7.0-0.7.1.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); $connection = $installer->getConnection(); $connection->beginTransaction(); diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php index fabb9f3d894..fef9a6e6bb3 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php index d95cbc3e8eb..a796a8de3e0 100644 --- a/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Paygate/sql/paygate_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paygate + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); // replace transaction URLs - see http://integrationwizard.x.com/sdkupdate/step3.php diff --git a/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php b/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php index 8969c47bb7d..f9210aa5c99 100644 --- a/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php +++ b/app/code/core/Mage/Payment/Block/Catalog/Product/View/Profile.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profile info/options product view block * + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + * * @method $this setDateHtmlId(string $string) */ class Mage_Payment_Block_Catalog_Product_View_Profile extends Mage_Core_Block_Template @@ -69,6 +74,7 @@ public function getDateHtml() ->setTime(true); return $calendar->getHtml(); } + return ''; } /** diff --git a/app/code/core/Mage/Payment/Block/Form.php b/app/code/core/Mage/Payment/Block/Form.php index 5c8d4b728a7..ca618fae793 100644 --- a/app/code/core/Mage/Payment/Block/Form.php +++ b/app/code/core/Mage/Payment/Block/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +56,7 @@ public function getMethodCode() * Retrieve field value data from payment info object * * @param string $field - * @return mixed + * @return string */ public function getInfoData($field) { diff --git a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php index 4195b54c5b0..22d5a89865a 100644 --- a/app/code/core/Mage/Payment/Block/Form/Banktransfer.php +++ b/app/code/core/Mage/Payment/Block/Form/Banktransfer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php index 7b9146cf60b..37d2ba815b9 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php +++ b/app/code/core/Mage/Payment/Block/Form/Cashondelivery.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php index ce46f60e092..b94937a6b80 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cc.php +++ b/app/code/core/Mage/Payment/Block/Form/Cc.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,7 +99,7 @@ public function getCcYears() /** * Retrieve has verification configuration * - * @return boolean + * @return bool */ public function hasVerification() { diff --git a/app/code/core/Mage/Payment/Block/Form/Ccsave.php b/app/code/core/Mage/Payment/Block/Form/Ccsave.php index b62eb540075..695534650c2 100644 --- a/app/code/core/Mage/Payment/Block/Form/Ccsave.php +++ b/app/code/core/Mage/Payment/Block/Form/Ccsave.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Checkmo.php b/app/code/core/Mage/Payment/Block/Form/Checkmo.php index 46f74ab132e..c880bfc98b2 100644 --- a/app/code/core/Mage/Payment/Block/Form/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Form/Checkmo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Container.php b/app/code/core/Mage/Payment/Block/Form/Container.php index bc7c902a0ad..33b5fe7fdbb 100644 --- a/app/code/core/Mage/Payment/Block/Form/Container.php +++ b/app/code/core/Mage/Payment/Block/Form/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php index e294a4fc48b..4a174bd13f8 100644 --- a/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Block/Form/Purchaseorder.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + */ class Mage_Payment_Block_Form_Purchaseorder extends Mage_Payment_Block_Form { protected function _construct() diff --git a/app/code/core/Mage/Payment/Block/Info.php b/app/code/core/Mage/Payment/Block/Info.php index c77c455b1ca..3953caeee31 100644 --- a/app/code/core/Mage/Payment/Block/Info.php +++ b/app/code/core/Mage/Payment/Block/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Banktransfer.php b/app/code/core/Mage/Payment/Block/Info/Banktransfer.php index 7168291eaa9..648a322ea3e 100644 --- a/app/code/core/Mage/Payment/Block/Info/Banktransfer.php +++ b/app/code/core/Mage/Payment/Block/Info/Banktransfer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Cc.php b/app/code/core/Mage/Payment/Block/Info/Cc.php index ee9d7bfe947..fb9cd063c76 100644 --- a/app/code/core/Mage/Payment/Block/Info/Cc.php +++ b/app/code/core/Mage/Payment/Block/Info/Cc.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -36,10 +37,7 @@ public function getCcTypeName() { $types = Mage::getSingleton('payment/config')->getCcTypes(); $ccType = $this->getInfo()->getCcType(); - if (isset($types[$ccType])) { - return $types[$ccType]; - } - return (empty($ccType)) ? Mage::helper('payment')->__('N/A') : $ccType; + return $types[$ccType] ?? (empty($ccType) ? Mage::helper('payment')->__('N/A') : $ccType); } /** diff --git a/app/code/core/Mage/Payment/Block/Info/Ccsave.php b/app/code/core/Mage/Payment/Block/Info/Ccsave.php index 62f3c2fe445..85450effed8 100644 --- a/app/code/core/Mage/Payment/Block/Info/Ccsave.php +++ b/app/code/core/Mage/Payment/Block/Info/Ccsave.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Checkmo.php b/app/code/core/Mage/Payment/Block/Info/Checkmo.php index 2592e223bbe..5bedf778eab 100644 --- a/app/code/core/Mage/Payment/Block/Info/Checkmo.php +++ b/app/code/core/Mage/Payment/Block/Info/Checkmo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Container.php b/app/code/core/Mage/Payment/Block/Info/Container.php index d5e9e5c62b9..b545d7302ea 100644 --- a/app/code/core/Mage/Payment/Block/Info/Container.php +++ b/app/code/core/Mage/Payment/Block/Info/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php index 65cdb7ea39c..0ce7a6450d6 100644 --- a/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Block/Info/Purchaseorder.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + */ class Mage_Payment_Block_Info_Purchaseorder extends Mage_Payment_Block_Info { protected function _construct() diff --git a/app/code/core/Mage/Payment/Exception.php b/app/code/core/Mage/Payment/Exception.php index 126029719a4..ab04a853a59 100644 --- a/app/code/core/Mage/Payment/Exception.php +++ b/app/code/core/Mage/Payment/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index 111b95e2446..7cd5ebf43f7 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -7,29 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payment module base helper * - * @category Mage - * @package Mage_Payment - * @author Magento Core Team + * @category Mage + * @package Mage_Payment + * @author Magento Core Team */ class Mage_Payment_Helper_Data extends Mage_Core_Helper_Abstract { const XML_PATH_PAYMENT_METHODS = 'payment'; const XML_PATH_PAYMENT_GROUPS = 'global/payment/groups'; + protected $_moduleName = 'Mage_Payment'; + /** * Retrieve method model object * @@ -270,7 +273,7 @@ public function getAllBillingAgreementMethods() * Returns value of Zero Subtotal Checkout / Enabled * * @param mixed $store - * @return boolean + * @return bool */ public function isZeroSubTotal($store = null) { diff --git a/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php b/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php index bbc16d3bf34..4834ac2061a 100644 --- a/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php +++ b/app/code/core/Mage/Payment/Model/Billing/Agreement/MethodInterface.php @@ -7,21 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Interface for payment methods that support billing agreements management * - * @author Magento Core Team + * @category Mage + * @package Mage_Payment + * @author Magento Core Team */ interface Mage_Payment_Model_Billing_Agreement_MethodInterface { diff --git a/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php b/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php index 54d7f35663f..352fc6669a4 100644 --- a/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php +++ b/app/code/core/Mage/Payment/Model/Billing/AgreementAbstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Config.php b/app/code/core/Mage/Payment/Model/Config.php index 8e464448333..551b9ecc152 100644 --- a/app/code/core/Mage/Payment/Model/Config.php +++ b/app/code/core/Mage/Payment/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Info.php b/app/code/core/Mage/Payment/Model/Info.php index 66ed4d9e3b6..339605c8805 100644 --- a/app/code/core/Mage/Payment/Model/Info.php +++ b/app/code/core/Mage/Payment/Model/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -174,7 +175,7 @@ public function getAdditionalInformation($key = null) if ($key === null) { return $this->_additionalInformation; } - return isset($this->_additionalInformation[$key]) ? $this->_additionalInformation[$key] : null; + return $this->_additionalInformation[$key] ?? null; } /** diff --git a/app/code/core/Mage/Payment/Model/Info/Exception.php b/app/code/core/Mage/Payment/Model/Info/Exception.php index cd77f20d00a..b1fd8136b56 100644 --- a/app/code/core/Mage/Payment/Model/Info/Exception.php +++ b/app/code/core/Mage/Payment/Model/Info/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php index 35c6f351180..8da4849d7ff 100644 --- a/app/code/core/Mage/Payment/Model/Method/Abstract.php +++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -304,7 +305,7 @@ public function canUseForCountry($country) * Check method for processing with base currency * * @param string $currencyCode - * @return boolean + * @return bool */ public function canUseForCurrency($currencyCode) { @@ -376,7 +377,7 @@ public function getInfoBlockType() } /** - * Retrieve payment iformation model object + * Retrieve payment information model object * * @return Mage_Payment_Model_Info */ diff --git a/app/code/core/Mage/Payment/Model/Method/Banktransfer.php b/app/code/core/Mage/Payment/Model/Method/Banktransfer.php index 36ab775a237..75d0979d673 100644 --- a/app/code/core/Mage/Payment/Model/Method/Banktransfer.php +++ b/app/code/core/Mage/Payment/Model/Method/Banktransfer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php b/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php index 118bf01ee7e..b202bdf6c9a 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php +++ b/app/code/core/Mage/Payment/Model/Method/Cashondelivery.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php index 831c7437315..4e4a5cc16c2 100644 --- a/app/code/core/Mage/Payment/Model/Method/Cc.php +++ b/app/code/core/Mage/Payment/Model/Method/Cc.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -149,7 +150,7 @@ public function validate() //validate credit card verification number if ($errorMsg === false && $this->hasVerification()) { $verifcationRegEx = $this->getVerificationRegEx(); - $regExp = isset($verifcationRegEx[$info->getCcType()]) ? $verifcationRegEx[$info->getCcType()] : ''; + $regExp = $verifcationRegEx[$info->getCcType()] ?? ''; if (!$info->getCcCid() || !$regExp || !preg_match($regExp, $info->getCcCid())) { $errorMsg = Mage::helper('payment')->__('Please enter a valid credit card verification number.'); } @@ -270,7 +271,7 @@ public function validateCcNum($ccNumber) * Other credit cart type number validation * * @param string $ccNumber - * @return boolean + * @return bool */ public function validateCcNumOther($ccNumber) { @@ -358,7 +359,7 @@ private function _getOrderId() /** * Grand total getter * - * @return string + * @return float */ private function _getAmount() { @@ -399,5 +400,6 @@ private function _isPlaceOrder() } elseif ($info instanceof Mage_Sales_Model_Order_Payment) { return true; } + return false; } } diff --git a/app/code/core/Mage/Payment/Model/Method/Ccsave.php b/app/code/core/Mage/Payment/Model/Method/Ccsave.php index dd743e0319d..59e69737ba0 100644 --- a/app/code/core/Mage/Payment/Model/Method/Ccsave.php +++ b/app/code/core/Mage/Payment/Model/Method/Ccsave.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Checkmo.php b/app/code/core/Mage/Payment/Model/Method/Checkmo.php index a33aa9771d5..2b42ca043e4 100644 --- a/app/code/core/Mage/Payment/Model/Method/Checkmo.php +++ b/app/code/core/Mage/Payment/Model/Method/Checkmo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Free.php b/app/code/core/Mage/Payment/Model/Method/Free.php index b3f3eb6a015..efb83b111d8 100644 --- a/app/code/core/Mage/Payment/Model/Method/Free.php +++ b/app/code/core/Mage/Payment/Model/Method/Free.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php b/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php index 0f953217542..02e415199c0 100644 --- a/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php +++ b/app/code/core/Mage/Payment/Model/Method/Purchaseorder.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + */ class Mage_Payment_Model_Method_Purchaseorder extends Mage_Payment_Model_Method_Abstract { protected $_code = 'purchaseorder'; diff --git a/app/code/core/Mage/Payment/Model/Observer.php b/app/code/core/Mage/Payment/Model/Observer.php index 7e5e5722cd4..0a22f1b4c68 100644 --- a/app/code/core/Mage/Payment/Model/Observer.php +++ b/app/code/core/Mage/Payment/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payment Observer * - * @category Mage - * @package Mage_Payment - * @author Magento Core Team + * @category Mage + * @package Mage_Payment + * @author Magento Core Team */ class Mage_Payment_Model_Observer { diff --git a/app/code/core/Mage/Payment/Model/Paygate/Result.php b/app/code/core/Mage/Payment/Model/Paygate/Result.php index 8502be89762..67d0dd1fb0a 100644 --- a/app/code/core/Mage/Payment/Model/Paygate/Result.php +++ b/app/code/core/Mage/Payment/Model/Paygate/Result.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + */ class Mage_Payment_Model_Paygate_Result extends Varien_Object { - } diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile.php b/app/code/core/Mage/Payment/Model/Recurring/Profile.php index a23be3b16bb..ab3448d084c 100644 --- a/app/code/core/Mage/Payment/Model/Recurring/Profile.php +++ b/app/code/core/Mage/Payment/Model/Recurring/Profile.php @@ -7,21 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring payment profile * Extends from Mage_Core_Abstract for a reason: to make descendants have its own resource * + * @category Mage + * @package Mage_Payment + * @author Magento Core Team + * * @method float getBillingAmount() * @method string getCurrencyCode() * @method bool getStartDateIsEditable() @@ -300,8 +305,9 @@ public function exportScheduleInfo() /** * Determine nearest possible profile start date * - * @param Zend_Date $minAllowed + * @param Zend_Date|null $minAllowed * @return $this + * @throws Zend_Date_Exception */ public function setNearestStartDatetime(Zend_Date $minAllowed = null) { @@ -458,6 +464,7 @@ public function getFieldLabel($field) case 'reference_id': return Mage::helper('payment')->__('Payment Reference ID'); } + return null; } /** @@ -490,6 +497,7 @@ public function getFieldComment($field) case 'init_may_fail': return Mage::helper('payment')->__('Whether to suspend the payment profile if the initial fee fails or add it to the outstanding balance.'); } + return null; } /** diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php b/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php index 61a81678c94..909aadd8e4e 100644 --- a/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php +++ b/app/code/core/Mage/Payment/Model/Recurring/Profile/MethodInterface.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profile gateway management interface + * + * @category Mage + * @package Mage_Payment + * @author Magento Core Team */ interface Mage_Payment_Model_Recurring_Profile_MethodInterface { diff --git a/app/code/core/Mage/Payment/Model/Source/Cctype.php b/app/code/core/Mage/Payment/Model/Source/Cctype.php index c5265a17733..807eb5f0851 100644 --- a/app/code/core/Mage/Payment/Model/Source/Cctype.php +++ b/app/code/core/Mage/Payment/Model/Source/Cctype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Payment/Model/Source/Invoice.php b/app/code/core/Mage/Payment/Model/Source/Invoice.php index 9b01071cd28..975987f0603 100644 --- a/app/code/core/Mage/Payment/Model/Source/Invoice.php +++ b/app/code/core/Mage/Payment/Model/Source/Invoice.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Automatic invoice create source model * - * @author Magento Core Team + * @category Mage + * @package Mage_Payment + * @author Magento Core Team */ class Mage_Payment_Model_Source_Invoice { diff --git a/app/code/core/Mage/Payment/etc/adminhtml.xml b/app/code/core/Mage/Payment/etc/adminhtml.xml index 6f320ba78b7..0783b6b6ed5 100644 --- a/app/code/core/Mage/Payment/etc/adminhtml.xml +++ b/app/code/core/Mage/Payment/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 96af3376ee3..87ac817dfef 100644 --- a/app/code/core/Mage/Payment/etc/config.xml +++ b/app/code/core/Mage/Payment/etc/config.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. (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/Payment/etc/system.xml b/app/code/core/Mage/Payment/etc/system.xml index e2120f68120..1a2cf6ecfab 100644 --- a/app/code/core/Mage/Payment/etc/system.xml +++ b/app/code/core/Mage/Payment/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..27a199850de 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Payment + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Settlement/Details.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php index 119145a5807..eb47e05931f 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php index dadd34f30aa..5096a78a2f2 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php index 5d3b9aa3530..35bfc28d793 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml paypal settlement reports grid block * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - class Mage_Paypal_Block_Adminhtml_Settlement_Report extends Mage_Adminhtml_Block_Widget_Grid_Container { public function __construct() diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php index afa5441a7f3..b8340e9b2bb 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/ApiWizard.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php index 207d2a00788..719a4847be4 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/ApiWizard.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/BmlApiWizard.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php index d30627dc5ae..a1aadceec2f 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/BmlApiWizard.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Field/Country.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php index d464a832d8f..6c244613e48 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Field/Hidden.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php index f6f846664aa..4cc2060bffd 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Field/SolutionType.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/SolutionType.php index 368034fa025..634e75c05ef 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php index 2feb21c8823..5aa49028aa6 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Deprecated.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,7 +38,7 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Deprecated protected function _getWasActiveConfigPath(Varien_Data_Form_Element_Abstract $element) { $groupConfig = $this->getGroup($element)->asArray(); - return isset($groupConfig['was_enabled_path']) ? $groupConfig['was_enabled_path'] : ''; + return $groupConfig['was_enabled_path'] ?? ''; } /** diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php index 483b642e8ab..2b23b2b4fbd 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,8 +26,7 @@ * @package Mage_Paypal * @author Magento Core Team */ -class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded - extends Mage_Adminhtml_Block_System_Config_Form_Fieldset +class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { /** * Return collapse state @@ -37,10 +37,6 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded protected function _getCollapseState($element) { $extra = Mage::getSingleton('admin/session')->getUser()->getExtra(); - if (isset($extra['configState'][$element->getId()])) { - return $extra['configState'][$element->getId()]; - } - - return true; + return $extra['configState'][$element->getId()] ?? true; } } diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php index bbb50bd3898..3ec929ff297 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -59,7 +60,7 @@ public function render(Varien_Data_Form_Element_Abstract $fieldset) $originalData = $fieldset->getOriginalData(); $this->addData([ 'fieldset_label' => $fieldset->getLegend(), - 'fieldset_help_url' => isset($originalData['help_url']) ? $originalData['help_url'] : '', + 'fieldset_help_url' => $originalData['help_url'] ?? '', ]); return $this->toHtml(); } @@ -82,10 +83,7 @@ public function getElements() */ public function getElement($elementId) { - if (isset($this->_elements[$elementId])) { - return $this->_elements[$elementId]; - } - return false; + return $this->_elements[$elementId] ?? false; } /** @@ -158,7 +156,7 @@ public function getElementComment(Varien_Data_Form_Element_Abstract $element) public function getElementOriginalData(Varien_Data_Form_Element_Abstract $element, $key) { $data = $element->getOriginalData(); - return isset($data[$key]) ? $data[$key] : ''; + return $data[$key] ?? ''; } /** diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php index 067cd29e924..70c5e34abb3 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Group.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Hint.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php index 0c8d5ced137..17d5b36262a 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Location.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php index 51852723552..3cd873605f9 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fieldset renderer for PayPal Merchant Location fieldset * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Location extends Mage_Adminhtml_Block_System_Config_Form_Fieldset diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php index 95c7c565c46..646a06ae6dc 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/PathDependent.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fieldset renderer for PayPal solutions which have dependencies on other solutions * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_PathDependent extends Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Payment @@ -36,7 +37,7 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_PathDependent */ public function hasActivePathDependencies($groupConfig) { - $activityPath = isset($groupConfig['hide_case_path']) ? $groupConfig['hide_case_path'] : ''; + $activityPath = $groupConfig['hide_case_path'] ?? ''; return !empty($activityPath) && (bool)(string)$this->_getConfigDataModel()->getConfigDataValue($activityPath); } diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php index 9274c727bbb..508490b2bc7 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Fieldset renderer for PayPal solution * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Payment extends Mage_Adminhtml_Block_System_Config_Form_Fieldset @@ -50,7 +51,7 @@ protected function _getFrontendClass($element) protected function _isPaymentEnabled($element, $configCallback = null) { $groupConfig = $this->getGroup($element)->asArray(); - $activityPath = isset($groupConfig['activity_path']) ? $groupConfig['activity_path'] : ''; + $activityPath = $groupConfig['activity_path'] ?? ''; if (empty($activityPath)) { return false; 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..8d6b2e5a0bf 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 @@ -7,20 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Adminhtml/System/Config/Payflowlink/Advanced.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php index 79db1931439..3a9e726cdfb 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Advanced.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Payflowlink/Info.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php index a5ee559526d..39a9cc58d42 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Payflowlink/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +53,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) * * @deprecated since 1.7.0.1 * @param string $routePath - * @return strting + * @return string */ public function getFrontendUrl($routePath) { diff --git a/app/code/core/Mage/Paypal/Block/Bml/Banners.php b/app/code/core/Mage/Paypal/Block/Bml/Banners.php index 78763e0cb5e..d31e17378e2 100644 --- a/app/code/core/Mage/Paypal/Block/Bml/Banners.php +++ b/app/code/core/Mage/Paypal/Block/Bml/Banners.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Bml/Form.php b/app/code/core/Mage/Paypal/Block/Bml/Form.php index e2f9338c99c..34be7e8559a 100644 --- a/app/code/core/Mage/Paypal/Block/Bml/Form.php +++ b/app/code/core/Mage/Paypal/Block/Bml/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Form.php b/app/code/core/Mage/Paypal/Block/Express/Form.php index 96974730ba0..718d1346f8f 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Form.php +++ b/app/code/core/Mage/Paypal/Block/Express/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php index ae9f6824f0a..64bd2130c81 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Paypal - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Paypal_Block_Express_Review extends Mage_Core_Block_Template { @@ -46,6 +47,11 @@ class Mage_Paypal_Block_Express_Review extends Mage_Core_Block_Template */ protected $_paypalActionPrefix = 'paypal'; + /** + * @var Mage_Sales_Model_Quote_Address + */ + protected $_address; + /** * Quote object setter * @@ -71,7 +77,7 @@ public function getBillingAddress() /** * Return quote shipping address * - * @return Mage_Sales_Model_Quote_Address + * @return Mage_Sales_Model_Quote_Address|false */ public function getShippingAddress() { diff --git a/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php b/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php index 0786b12346e..2514e1787f9 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Billing.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Review/Details.php b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php index a30906c6912..18ad832e825 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Details.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Details.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +32,7 @@ class Mage_Paypal_Block_Express_Review_Details extends Mage_Checkout_Block_Cart_ /** * Return review shipping address * - * @return Mage_Sales_Model_Order_Address + * @return Mage_Sales_Model_Quote_Address */ public function getAddress() { 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..8dea55e7171 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review/Shipping.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..c48c1d575d5 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Shortcut.php +++ b/app/code/core/Mage/Paypal/Block/Express/Shortcut.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Block/Hosted/Pro/Form.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php index 97bb2e3ca19..a660c42104b 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php index d2794de62de..f814446df6b 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Iframe.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php index 5146557881e..cc53778ff78 100644 --- a/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php +++ b/app/code/core/Mage/Paypal/Block/Hosted/Pro/Info.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Iframe.php b/app/code/core/Mage/Paypal/Block/Iframe.php index 1d3f1be8cd0..64df12d1d13 100644 --- a/app/code/core/Mage/Paypal/Block/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Iframe.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Logo.php b/app/code/core/Mage/Paypal/Block/Logo.php index 53ed10775dd..eeec2e8361d 100644 --- a/app/code/core/Mage/Paypal/Block/Logo.php +++ b/app/code/core/Mage/Paypal/Block/Logo.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal online logo with additional options + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team * @deprecated */ class Mage_Paypal_Block_Logo extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php index 42e77c48283..8bd14064e81 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php index bc9cfa4ae7f..4d3ff0ff2e9 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Iframe.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php index 236c73a1c71..193134728dd 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Info.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php index 6091fbb1e02..e2e53148619 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Advanced/Review.php @@ -7,26 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paypal Payflow Advanced Express Onepage checkout block * - * @deprecated since 1.6.2.0 * @category Mage * @package Mage_Paypal - * @author Magento Core Team + * @author Magento Core Team + * @deprecated since 1.6.2.0 */ class Mage_Paypal_Block_Payflow_Advanced_Review extends Mage_Paypal_Block_Payflow_Link_Review { - } diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php index fbcbfced7ba..00cb912d431 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php index 822cad7caa0..05242c1ba77 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Iframe.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php index 7914f1ed119..73f9b227ca1 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Info.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php b/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php index 0c16b8796be..9a4d818ed00 100644 --- a/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php +++ b/app/code/core/Mage/Paypal/Block/Payflow/Link/Review.php @@ -7,28 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paypal PayflowLink Express Onepage checkout block * - * @deprecated since 1.6.2.0 * @category Mage * @package Mage_Paypal - * @author Magento Core Team + * @author Magento Core Team + * @deprecated since 1.6.2.0 */ class Mage_Paypal_Block_Payflow_Link_Review extends Mage_Paypal_Block_Express_Review { - /** * Retrieve payment method and assign additional template values * diff --git a/app/code/core/Mage/Paypal/Block/Payment/Info.php b/app/code/core/Mage/Paypal/Block/Payment/Info.php index 04af6e62bf8..b312ff4fc07 100644 --- a/app/code/core/Mage/Paypal/Block/Payment/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payment/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,6 +39,7 @@ public function getCcTypeName() if (Mage_Paypal_Model_Config::getIsCreditCardMethod($this->getInfo()->getMethod())) { return parent::getCcTypeName(); } + return null; } /** diff --git a/app/code/core/Mage/Paypal/Block/Standard/Form.php b/app/code/core/Mage/Paypal/Block/Standard/Form.php index df3dcf16913..a9b25efa132 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Form.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Block/Standard/Redirect.php b/app/code/core/Mage/Paypal/Block/Standard/Redirect.php index 8daa53499c0..88b68fab91c 100644 --- a/app/code/core/Mage/Paypal/Block/Standard/Redirect.php +++ b/app/code/core/Mage/Paypal/Block/Standard/Redirect.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Block_Standard_Redirect extends Mage_Core_Block_Abstract { diff --git a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php index dfe77bef83b..9ad8a2bf73f 100644 --- a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php +++ b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -42,6 +43,21 @@ abstract class Mage_Paypal_Controller_Express_Abstract extends Mage_Core_Control */ protected $_quote = false; + /** + * @var string + */ + protected $_checkoutType; + + /** + * @var string + */ + protected $_configMethod; + + /** + * @var string + */ + protected $_configType; + /** * Instantiate config */ @@ -142,7 +158,7 @@ public function cancelAction() { try { $this->_initToken(false); - // TODO verify if this logic of order cancelation is deprecated + // TODO verify if this logic of order cancellation is deprecated // if there is an order - cancel it $orderId = $this->_getCheckoutSession()->getLastOrderId(); $order = ($orderId) ? Mage::getModel('sales/order')->load($orderId) : false; @@ -377,7 +393,6 @@ public function placeOrderAction() * Process PayPal API's processable errors * * @param Mage_Paypal_Model_Api_ProcessableException $exception - * @throws Mage_Paypal_Model_Api_ProcessableException */ protected function _processPaypalApiError($exception) { diff --git a/app/code/core/Mage/Paypal/Exception.php b/app/code/core/Mage/Paypal/Exception.php index 9e111a6b4a8..69b15cd12b8 100644 --- a/app/code/core/Mage/Paypal/Exception.php +++ b/app/code/core/Mage/Paypal/Exception.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Helper/Checkout.php b/app/code/core/Mage/Paypal/Helper/Checkout.php index 09a49315f7d..2b0b5a7d870 100644 --- a/app/code/core/Mage/Paypal/Helper/Checkout.php +++ b/app/code/core/Mage/Paypal/Helper/Checkout.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +27,8 @@ */ class Mage_Paypal_Helper_Checkout extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Paypal'; + /** * Restore last active quote based on checkout session * diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php index dc68fd7e0fe..ee6d2babc99 100644 --- a/app/code/core/Mage/Paypal/Helper/Data.php +++ b/app/code/core/Mage/Paypal/Helper/Data.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Paypal Data helper * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Paypal'; + /** * US country code */ @@ -68,9 +71,10 @@ public function shouldAskToCreateBillingAgreement(Mage_Paypal_Model_Config $conf * Return backend config for element like JSON * * @param Varien_Data_Form_Element_Abstract $element - * @return string + * @return false|string */ - public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element) { + public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element) + { $config = $element->getFieldConfig()->backend_congif; if (!$config) { return false; diff --git a/app/code/core/Mage/Paypal/Helper/Hss.php b/app/code/core/Mage/Paypal/Helper/Hss.php index d57bbac475e..14139d595d6 100644 --- a/app/code/core/Mage/Paypal/Helper/Hss.php +++ b/app/code/core/Mage/Paypal/Helper/Hss.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Paypal_Helper_Hss extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Paypal'; + /** * Hosted Sole Solution methods * diff --git a/app/code/core/Mage/Paypal/Model/Api/Abstract.php b/app/code/core/Mage/Paypal/Model/Api/Abstract.php index d8ee4d35654..8c471cb3fc3 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Abstract.php +++ b/app/code/core/Mage/Paypal/Model/Api/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -305,7 +306,7 @@ public function getLocaleCode() } /** - * Always take into accoun + * Always take into account */ public function getFraudManagementFiltersEnabled() { @@ -537,7 +538,7 @@ protected function _importStreetFromAddress(Varien_Object $address, array &$to) $i = 0; foreach ($keys as $key) { - $to[$key] = isset($street[$i]) ? $street[$i]: ''; + $to[$key] = $street[$i] ?? ''; $i++; } } @@ -558,7 +559,7 @@ protected function _buildQuery($request) * Paypal note: The value for quantity must be a positive integer. Null, zero, or negative numbers are not allowed. * * @param float|string|int $value - * @return string + * @return int */ protected function _filterQty($value) { diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php index 31bfc4944fd..0d1369bc2ae 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php +++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * NVP API wrappers model + * + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team + * * @TODO: move some parts to abstract, don't hesitate to throw exceptions on api calls */ class Mage_Paypal_Model_Api_Nvp extends Mage_Paypal_Model_Api_Abstract @@ -1047,8 +1053,8 @@ protected function _handleCallErrors($response) $errorMessages = implode(' ', array_values($errorMessages)); $exceptionLogMessage = sprintf('PayPal NVP gateway errors: %s Correlation ID: %s. Version: %s.', $errorMessages, - isset($response['CORRELATIONID']) ? $response['CORRELATIONID'] : '', - isset($response['VERSION']) ? $response['VERSION'] : '' + $response['CORRELATIONID'] ?? '', + $response['VERSION'] ?? '' ); $exception = new $exceptionClass($exceptionLogMessage, $exceptionCode); @@ -1324,10 +1330,7 @@ protected function _importAddresses(array $to) */ protected function _filterCcType($value) { - if (isset($this->_supportedCcTypes[$value])) { - return $this->_supportedCcTypes[$value]; - } - return ''; + return $this->_supportedCcTypes[$value] ?? ''; } /** diff --git a/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php b/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php index dede4f06ec9..10d820f6570 100644 --- a/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php +++ b/app/code/core/Mage/Paypal/Model/Api/ProcessableException.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Exception which thrown by PayPal API in case of processable error codes + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Api_ProcessableException extends Mage_Core_Exception { diff --git a/app/code/core/Mage/Paypal/Model/Api/Standard.php b/app/code/core/Mage/Paypal/Model/Api/Standard.php index b9828b82c92..e49ae4f2e33 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Api/Standard.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Bml.php b/app/code/core/Mage/Paypal/Model/Bml.php index ad09784f1e9..20e6d56aef9 100644 --- a/app/code/core/Mage/Paypal/Model/Bml.php +++ b/app/code/core/Mage/Paypal/Model/Bml.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Cart.php b/app/code/core/Mage/Paypal/Model/Cart.php index c0666eb0202..5172656ce51 100644 --- a/app/code/core/Mage/Paypal/Model/Cart.php +++ b/app/code/core/Mage/Paypal/Model/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,8 +42,7 @@ class Mage_Paypal_Model_Cart /** * Order or quote instance * - * @var Mage_Sales_Model_Order - * @var Mage_Sales_Model_Quote + * @var Mage_Sales_Model_Order|Mage_Sales_Model_Quote */ protected $_salesEntity = null; diff --git a/app/code/core/Mage/Paypal/Model/Cert.php b/app/code/core/Mage/Paypal/Model/Cert.php index b51a81cce27..aaf2a0950fd 100644 --- a/app/code/core/Mage/Paypal/Model/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Cert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,9 +33,6 @@ class Mage_Paypal_Model_Cert extends Mage_Core_Model_Abstract */ const BASEPATH_PAYPAL_CERT = 'cert/paypal'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('paypal/cert'); diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php index 42d0c15b3e6..4b608e8b9b3 100644 --- a/app/code/core/Mage/Paypal/Model/Config.php +++ b/app/code/core/Mage/Paypal/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -599,6 +600,33 @@ class Mage_Paypal_Model_Config 'zh_XC', ]; + public $allow_ba_signup; + public $api_cert; + public $api_password; + public $api_signature; + public $api_username; + public $apiAuthentication; + public $apiPassword; + public $apiSignature; + public $apiUsername; + public $business_account; + public $businessAccount; + public $buttonFlavor; + public $buttonType; + public $cctypes; + public $debug; + public $lineItemsEnabled; + public $lineItemsSummary; + public $paymentAction; + public $paymentMarkSize; + public $requireBillingAddress; + public $sandboxFlag; + public $solutionType; + public $transferShippingOptions; + public $verifyPeer; + public $visible_on_cart; + public $visible_on_product; + /** * Set method and store id, if specified * @@ -924,7 +952,7 @@ public function getCountryMethods($countryCode = null) if ($countryCode === null) { return $countryMethods; } - return isset($countryMethods[$countryCode]) ? $countryMethods[$countryCode] : $countryMethods['other']; + return $countryMethods[$countryCode] ?? $countryMethods['other']; } /** @@ -1235,7 +1263,7 @@ public function getAdditionalOptionsLogoTypes() * Return PayPal logo URL with additional options * * @param string $localeCode Supported locale code - * @param string $type One of supported logo types + * @param string|false $type One of supported logo types * @return string|bool Logo Image URL or false if logo disabled in configuration */ public function getAdditionalOptionsLogoUrl($localeCode, $type = false) @@ -1335,6 +1363,7 @@ public function getPaymentAction() case self::PAYMENT_ACTION_ORDER: return Mage_Payment_Model_Method_Abstract::ACTION_ORDER; } + return null; } /** @@ -1627,6 +1656,7 @@ private function _matchBnCountryCode($code) case 'JP': case 'MX': case 'NL': case 'PL': case 'SG': case 'ES': case 'CH': case 'UK': case 'US': return $code; } + return null; } /** diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php index 7e02acab4f8..f08e820238c 100644 --- a/app/code/core/Mage/Paypal/Model/Direct.php +++ b/app/code/core/Mage/Paypal/Model/Direct.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index 101f0961a1d..a848fadad3a 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -540,7 +541,7 @@ public function assignData($data) $result = parent::assignData($data); $key = Mage_Paypal_Model_Express_Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT; if (is_array($data)) { - $this->getInfoInstance()->setAdditionalInformation($key, isset($data[$key]) ? $data[$key] : null); + $this->getInfoInstance()->setAdditionalInformation($key, $data[$key] ?? null); } elseif ($data instanceof Varien_Object) { $this->getInfoInstance()->setAdditionalInformation($key, $data->getData($key)); @@ -697,7 +698,7 @@ protected function _callDoAuthorize($amount, $payment, $parentTransactionId) * * @param Mage_Sales_Model_Order_Payment_Transaction $transaction * @param int $period - * @return boolean + * @return bool */ protected function _isTransactionExpired(Mage_Sales_Model_Order_Payment_Transaction $transaction, $period) { diff --git a/app/code/core/Mage/Paypal/Model/Express/Checkout.php b/app/code/core/Mage/Paypal/Model/Express/Checkout.php index 11846e393cc..6e0141971ac 100644 --- a/app/code/core/Mage/Paypal/Model/Express/Checkout.php +++ b/app/code/core/Mage/Paypal/Model/Express/Checkout.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -792,7 +793,7 @@ protected function _getApi() * * @param Mage_Sales_Model_Quote_Address $address * @param bool $mayReturnEmpty - * @return array|false + * @return array */ protected function _prepareShippingOptions( Mage_Sales_Model_Quote_Address $address, @@ -869,7 +870,7 @@ protected function _prepareShippingOptions( * * @param Varien_Object $option1 * @param Varien_Object $option2 - * @return integer + * @return int */ protected static function cmpShippingOptions(Varien_Object $option1, Varien_Object $option2) { diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro.php b/app/code/core/Mage/Paypal/Model/Hostedpro.php index c13819470f5..c27f6644ec4 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -188,10 +189,7 @@ protected function _sendFormUrlRequest(Mage_Paypal_Model_Hostedpro_Request $requ $api = $this->_pro->getApi(); $response = $api->call(self::BM_BUTTON_METHOD, $request->getRequestData()); - if (!isset($response['EMAILLINK'])) { - return false; - } - return $response['EMAILLINK']; + return $response['EMAILLINK'] ?? false; } /** diff --git a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php index fd4e7a6f6bd..40a55b62eb2 100644 --- a/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php +++ b/app/code/core/Mage/Paypal/Model/Hostedpro/Request.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Website Payments Pro Hosted Solution request model to get token. * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - class Mage_Paypal_Model_Hostedpro_Request extends Varien_Object { /** @@ -196,8 +196,8 @@ protected function _getShippingAddress(Varien_Object $address) $street = Mage::helper('customer/address') ->convertStreetLines($address->getStreet(), 2); - $request['address1'] = isset($street[0]) ? $street[0]: ''; - $request['address2'] = isset($street[1]) ? $street[1]: ''; + $request['address1'] = $street[0] ?? ''; + $request['address2'] = $street[1] ?? ''; return $request; } @@ -223,8 +223,8 @@ protected function _getBillingAddress(Varien_Object $address) $street = Mage::helper('customer/address') ->convertStreetLines($address->getStreet(), 2); - $request['billing_address1'] = isset($street[0]) ? $street[0]: ''; - $request['billing_address2'] = isset($street[1]) ? $street[1]: ''; + $request['billing_address1'] = $street[0] ?? ''; + $request['billing_address2'] = $street[1] ?? ''; return $request; } diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php index a8d5f0d7e9d..04705e60452 100644 --- a/app/code/core/Mage/Paypal/Model/Info.php +++ b/app/code/core/Mage/Paypal/Model/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -213,7 +214,7 @@ public function importToPayment($from, Mage_Payment_Model_Info $payment) * * @param Mage_Payment_Model_Info $payment * @param array|Varien_Object|callback $to - * @param array $map + * @param array|null $map * @return array|Varien_Object */ public function &exportFromPayment(Mage_Payment_Model_Info $payment, $to, array $map = null) diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php index dae1ba005e9..d0e4b7bce13 100644 --- a/app/code/core/Mage/Paypal/Model/Ipn.php +++ b/app/code/core/Mage/Paypal/Model/Ipn.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Instant Payment Notification processor model + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Ipn { @@ -81,15 +86,15 @@ public function getRequestData($key = null) if ($key === null) { return $this->_request; } - return isset($this->_request[$key]) ? $this->_request[$key] : null; + return $this->_request[$key] ?? null; } /** * Get ipn data, send verification to PayPal, run corresponding handler * * @param array $request - * @param Zend_Http_Client_Adapter_Interface $httpAdapter - * @throws Exception + * @param Zend_Http_Client_Adapter_Interface|null $httpAdapter + * @throws Mage_Core_Exception */ public function processIpnRequest(array $request, Zend_Http_Client_Adapter_Interface $httpAdapter = null) { @@ -271,7 +276,7 @@ protected function _processOrder() $this->_info = Mage::getSingleton('paypal/info'); try { // Handle payment_status - $transactionType = isset($this->_request['txn_type']) ? $this->_request['txn_type'] : null; + $transactionType = $this->_request['txn_type'] ?? null; switch ($transactionType) { // handle new case created case Mage_Paypal_Model_Info::TXN_TYPE_NEW_CASE: @@ -299,7 +304,7 @@ protected function _processOrder() */ protected function _registerAdjustment() { - $reasonCode = isset($this->_request['reason_code']) ? $this->_request['reason_code'] : null; + $reasonCode = $this->_request['reason_code'] ?? null; $reasonComment = $this->_info::explainReasonCode($reasonCode); $notificationAmount = $this->_order->getBaseCurrency()->formatTxt($this->_request['mc_gross']); /** @@ -316,11 +321,11 @@ protected function _registerAdjustment() */ protected function _registerDispute() { - $reasonCode = isset($this->_request['reason_code']) ? $this->_request['reason_code'] : null; + $reasonCode = $this->_request['reason_code'] ?? null; $reasonComment = $this->_info::explainReasonCode($reasonCode); - $caseType = isset($this->_request['case_type']) ? $this->_request['case_type'] : null; + $caseType = $this->_request['case_type'] ?? null; $caseTypeLabel = $this->_info::getCaseTypeLabel($caseType); - $caseId = isset($this->_request['case_id']) ? $this->_request['case_id'] : null; + $caseId = $this->_request['case_id'] ?? null; /** * Add IPN comment about registered dispute */ @@ -496,7 +501,7 @@ protected function _registerPaymentCapture($skipFraudDetection = false) protected function _registerPaymentDenial() { $this->_importPaymentInformation(); - /** @var Mage_Sales_Model_Order_Payment */ + /** @var Mage_Sales_Model_Order_Payment $payment */ $payment = $this->_order->getPayment(); $payment->setTransactionId($this->getRequestData('txn_id')) @@ -579,15 +584,12 @@ protected function _registerPaymentRefund() */ protected function _registerPaymentReversal() { - $reasonCode = isset($this->_request['reason_code']) ? $this->_request['reason_code'] : null; + $reasonCode = $this->_request['reason_code'] ?? null; $reasonComment = $this->_info::explainReasonCode($reasonCode); $notificationAmount = $this->_order ->getBaseCurrency() ->formatTxt($this->_request['mc_gross'] + $this->_request['mc_fee']); - $paymentStatus = $this->_filterPaymentStatus(isset($this->_request['payment_status']) - ? $this->_request['payment_status'] - : null - ); + $paymentStatus = $this->_filterPaymentStatus($this->_request['payment_status'] ?? null); $orderStatus = ($paymentStatus == Mage_Paypal_Model_Info::PAYMENTSTATUS_REVERSED) ? Mage_Paypal_Model_Info::ORDER_STATUS_REVERSED : Mage_Paypal_Model_Info::ORDER_STATUS_CANCELED_REVERSAL; diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php index 2c01acfa3cd..e1a7e042135 100644 --- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php +++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php b/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php index d83f0016824..184a87bdab0 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Cert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..38d20c131a3 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php index 220ed0ff384..bbb46267e99 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Row extends Mage_Paypal_Model_Resource_Report_Settlement_Row diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php index c7c4590e771..cb2c150f193 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Report/Settlement/Row/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php index dc6a29acfd0..63889a2252a 100644 --- a/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Paypal/Model/Observer.php index 3a453d72781..e2698cbf3a5 100644 --- a/app/code/core/Mage/Paypal/Model/Observer.php +++ b/app/code/core/Mage/Paypal/Model/Observer.php @@ -7,28 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal module observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - class Mage_Paypal_Model_Observer { /** * Goes to reports.paypal.com and fetches Settlement reports. - * @return $this */ public function fetchReports() { diff --git a/app/code/core/Mage/Paypal/Model/Payflow/Request.php b/app/code/core/Mage/Paypal/Model/Payflow/Request.php index 1327ebc3f99..2f59a4d4878 100644 --- a/app/code/core/Mage/Paypal/Model/Payflow/Request.php +++ b/app/code/core/Mage/Paypal/Model/Payflow/Request.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payflow Link request model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Payflow_Request extends Varien_Object { @@ -43,10 +44,10 @@ public function __call($method, $args) } switch (substr($method, 0, 3)) { case 'get' : - return $this->getData($key, isset($args[0]) ? $args[0] : null); + return $this->getData($key, $args[0] ?? null); case 'set' : - return $this->setData($key, isset($args[0]) ? $args[0] : null); + return $this->setData($key, $args[0] ?? null); case 'uns' : return $this->unsetData($key); diff --git a/app/code/core/Mage/Paypal/Model/Payflowadvanced.php b/app/code/core/Mage/Paypal/Model/Payflowadvanced.php index e8ea82ab9c1..d2b9762023e 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowadvanced.php +++ b/app/code/core/Mage/Paypal/Model/Payflowadvanced.php @@ -7,25 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payments Advanced gateway model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - class Mage_Paypal_Model_Payflowadvanced extends Mage_Paypal_Model_Payflowlink { /** diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php index 5148b2e940d..189f19f580f 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowlink.php +++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payflow Link payment gateway model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - class Mage_Paypal_Model_Payflowlink extends Mage_Paypal_Model_Payflowpro { /** @@ -159,6 +159,7 @@ public function getTemplate() * * @param string $paymentAction * @param Varien_Object $stateObject + * @return $this */ public function initialize($paymentAction, $stateObject) { @@ -185,6 +186,7 @@ public function initialize($paymentAction, $stateObject) default: break; } + return $this; } /** @@ -328,7 +330,7 @@ protected function _getFraudMessage() /** * Check response from Payflow gateway. * - * @return Mage_Sales_Model_Order in case of validation passed + * @return false|Mage_Sales_Model_Order in case of validation passed * @throws Mage_Core_Exception in other cases */ protected function _getOrderFromResponse() @@ -488,6 +490,7 @@ protected function _getTrxTokenType() case Mage_Paypal_Model_Config::PAYMENT_ACTION_SALE: return self::TRXTYPE_SALE; } + return ''; } /** @@ -505,7 +508,7 @@ protected function _generateSecureTokenId() * * @param mixed $format * @param mixed $string - * @return mixed + * @return string */ protected function _formatStr($format, $string) { @@ -585,7 +588,6 @@ protected function _initialize(Varien_Object $payment, $amount) * * @deprecated since 1.6.2.0 * @param string $token - * @throws Mage_Core_Exception */ public function prepareOrderReview($token = null) { @@ -633,8 +635,7 @@ protected function _checkTransaction($transaction, $amount) * Check response from Payflow gateway. * * @deprecated since 1.6.2.0 - * @return Mage_Sales_Model_Abstract in case of validation passed - * @throws Mage_Core_Exception in other cases + * @return null */ protected function _getDocumentFromResponse() { diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php index 58635557425..86425ae3b31 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowpro.php +++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php @@ -7,26 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payflow Pro payment gateway model * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ - -class Mage_Paypal_Model_Payflowpro extends Mage_Payment_Model_Method_Cc +class Mage_Paypal_Model_Payflowpro extends Mage_Payment_Model_Method_Cc { /** * Transaction action codes @@ -139,6 +139,7 @@ public function getConfigPaymentAction() case Mage_Paypal_Model_Config::PAYMENT_ACTION_SALE: return Mage_Payment_Model_Method_Abstract::ACTION_AUTHORIZE_CAPTURE; } + return ''; } /** @@ -155,7 +156,7 @@ public function authorize(Varien_Object $payment, $amount) $response = $this->_postRequest($request); $this->_processErrors($response); - switch ($response->getResultCode()){ + switch ($response->getResultCode()) { case self::RESPONSE_CODE_APPROVED: $payment->setTransactionId($response->getPnref())->setIsTransactionClosed(0); break; @@ -211,7 +212,7 @@ public function capture(Varien_Object $payment, $amount) $response = $this->_postRequest($request); $this->_processErrors($response); - switch ($response->getResultCode()){ + switch ($response->getResultCode()) { case self::RESPONSE_CODE_APPROVED: $payment->setTransactionId($response->getPnref())->setIsTransactionClosed(0); break; @@ -238,7 +239,7 @@ public function void(Varien_Object $payment) $response = $this->_postRequest($request); $this->_processErrors($response); - if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED){ + if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED) { $payment->setTransactionId($response->getPnref()) ->setIsTransactionClosed(1) ->setShouldCloseParentTransaction(1); @@ -271,7 +272,7 @@ public function canVoid(Varien_Object $payment) * Attempt to void the authorization on cancelling * * @param Varien_Object $payment - * @return $this + * @return $this|false */ public function cancel(Varien_Object $payment) { @@ -293,11 +294,11 @@ public function refund(Varien_Object $payment, $amount) $request = $this->_buildBasicRequest($payment); $request->setTrxtype(self::TRXTYPE_CREDIT); $request->setOrigid($payment->getParentTransactionId()); - $request->setAmt(round((float)$amount,2)); + $request->setAmt(round((float)$amount, 2)); $response = $this->_postRequest($request); $this->_processErrors($response); - if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED){ + if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED) { $payment->setTransactionId($response->getPnref()) ->setIsTransactionClosed(1); $payment->setShouldCloseParentTransaction(!$payment->getCreditmemo()->getInvoice()->canRefund()); @@ -326,7 +327,7 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact ->setIsTransactionClosed(0); if ($response->getOrigresult() == self::RESPONSE_CODE_APPROVED) { $payment->setIsTransactionApproved(true); - } else if ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_MERCHANT) { + } elseif ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_MERCHANT) { $payment->setIsTransactionDenied(true); } } @@ -402,13 +403,12 @@ protected function _postRequest(Varien_Object $request) ->setHeaders('X-VPS-CLIENT-TIMEOUT: ' . $this->_clientTimeout); try { - /** - * we are sending request to payflow pro without url encoding - * so we set up _urlEncodeBody flag to false - */ + /** + * we are sending request to payflow pro without url encoding + * so we set up _urlEncodeBody flag to false + */ $response = $client->setUrlEncodeBody(false)->request(); - } - catch (Exception $e) { + } catch (Exception $e) { $result->setResponseCode(-1) ->setResponseReasonCode($e->getCode()) ->setResponseReasonText($e->getMessage()); @@ -421,9 +421,9 @@ protected function _postRequest(Varien_Object $request) $response = strstr($response->getBody(), 'RESULT'); $valArray = explode('&', $response); - foreach($valArray as $val) { - $valArray2 = explode('=', $val); - $result->setData(strtolower($valArray2[0]), $valArray2[1]); + foreach ($valArray as $val) { + $valArray2 = explode('=', $val); + $result->setData(strtolower($valArray2[0]), $valArray2[1]); } $result->setResultCode($result->getResult()) @@ -445,14 +445,15 @@ protected function _postRequest(Varien_Object $request) protected function _buildPlaceRequest(Varien_Object $payment, $amount) { $request = $this->_buildBasicRequest($payment); - $request->setAmt(round($amount,2)); + $request->setAmt(round($amount, 2)); $request->setAcct($payment->getCcNumber()); - $request->setExpdate(sprintf('%02d',$payment->getCcExpMonth()) . substr($payment->getCcExpYear(),-2,2)); + $request->setExpdate(sprintf('%02d', $payment->getCcExpMonth()) . substr($payment->getCcExpYear(), -2, 2)); $request->setCvv2($payment->getCcCid()); - if ($this->getIsCentinelValidationEnabled()){ + if ($this->getIsCentinelValidationEnabled()) { $params = []; $params = $this->getCentinelValidator()->exportCmpiData($params); + /** @var Varien_Object $request */ $request = Varien_Object_Mapper::accumulateByMap($params, $request, $this->_centinelFieldMap); } diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php index d77855de9c6..525736752d4 100644 --- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php @@ -7,30 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +43,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 */ @@ -131,7 +128,7 @@ protected function _afterLoadByTxnId() * * @param string $key * @param mixed $value - * @return Mage_Paypal_Model_Order_Payment_Transaction + * @return $this * @throws Mage_Core_Exception */ public function setAdditionalInformation($key, $value) @@ -159,7 +156,7 @@ public function getAdditionalInformation($key = null) $info = []; } if ($key) { - return (isset($info[$key]) ? $info[$key] : null); + return $info[$key] ?? null; } return $info; } @@ -200,7 +197,6 @@ public function isFailsafe($setFailsafe = null) /** * Verify data required for saving * @return $this - * @throws Mage_Core_Exception */ protected function _beforeSave() { diff --git a/app/code/core/Mage/Paypal/Model/Pro.php b/app/code/core/Mage/Paypal/Model/Pro.php index c7a1053a2ee..c9e6088cf51 100644 --- a/app/code/core/Mage/Paypal/Model/Pro.php +++ b/app/code/core/Mage/Paypal/Model/Pro.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Website Payments Pro implementation for payment method instaces * This model was created because right now PayPal Direct and PayPal Express payment methods cannot have same abstract + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_Pro { diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Report/Settlement.php index 937af2d5c54..2f0d3551795 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* @@ -24,8 +25,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 +39,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 +158,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/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php index bbd0f3b6057..c304ef882c1 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php @@ -7,21 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /* * Model for report rows - */ -/** + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team + * * @method Mage_Paypal_Model_Resource_Report_Settlement_Row _getResource() * @method Mage_Paypal_Model_Resource_Report_Settlement_Row getResource() * @method int getReportId() @@ -56,10 +60,6 @@ * @method Mage_Paypal_Model_Report_Settlement_Row setCustomField(string $value) * @method string getConsumerId() * @method Mage_Paypal_Model_Report_Settlement_Row setConsumerId(string $value) - * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team */ class Mage_Paypal_Model_Report_Settlement_Row extends Mage_Core_Model_Abstract { @@ -77,9 +77,6 @@ class Mage_Paypal_Model_Report_Settlement_Row extends Mage_Core_Model_Abstract */ protected $_castedAmounts = []; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('paypal/report_settlement_row'); @@ -104,10 +101,7 @@ public function getReferenceType($code = null) asort($types); return $types; } - if (isset($types[$code])) { - return $types[$code]; - } - return $code; + return $types[$code] ?? $code; } /** @@ -119,10 +113,7 @@ public function getReferenceType($code = null) public function getTransactionEvent($code) { $this->_generateEventLabels(); - if (isset(self::$_eventList[$code])) { - return self::$_eventList[$code]; - } - return $code; + return self::$_eventList[$code] ?? $code; } /** @@ -152,10 +143,7 @@ public function getDebitCreditText($code = null) if($code === null) { return $options; } - if (isset($options[$code])) { - return $options[$code]; - } - return $code; + return $options[$code] ?? $code; } /** diff --git a/app/code/core/Mage/Paypal/Model/Resource/Cert.php b/app/code/core/Mage/Paypal/Model/Resource/Cert.php index de76232fdbd..aa6af8cb44e 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Cert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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..c9b9e35eded 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -84,9 +85,7 @@ public function loadObjectByTxnId(Mage_Paypal_Model_Payment_Transaction $transac /** * Serialize additional information, if any * - * @throws Mage_Core_Exception - * - * @param Mage_Core_Model_Abstract $transaction + * @param Mage_Paypal_Model_Payment_Transaction $transaction * @return $this */ protected function _beforeSave(Mage_Core_Model_Abstract $transaction) diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php index 776cdd399cf..24018d061f0 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -48,7 +49,7 @@ protected function _construct() * CreatedAt filter setter * * @param string $date - * @return Mage_Sales_Model_Resource_Order_Payment_Transaction_Collection + * @return $this */ public function addCreatedBeforeFilter($date) { 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..cd0f43ef320 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php index 7137abba64b..964cd0f80ab 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** *Report settlement row 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_Row extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource model initialization. - * Set main entity table name and primary key field name. - */ protected function _construct() { $this->_init('paypal/settlement_report_row', 'row_id'); diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php index a3735d8aed6..198f6efd54f 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/Resource/Setup.php b/app/code/core/Mage/Paypal/Model/Resource/Setup.php index 5875cb4e8f9..8be82e3e7e6 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Setup.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..4b5ecd2c723 100644 --- a/app/code/core/Mage/Paypal/Model/Session.php +++ b/app/code/core/Mage/Paypal/Model/Session.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..e841ad2fe67 100644 --- a/app/code/core/Mage/Paypal/Model/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Standard.php @@ -7,22 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Backend/Cert.php b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php index 8b22cf3fdeb..cf93bdf529b 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cert.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php index e64c945a079..681bd2d68eb 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Backend/Cron.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php b/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php index 216fd5cd8aa..7447e1ad0cc 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Backend/MerchantCountry.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Backend model for merchant country. Default country used instead of empty value. + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Backend_MerchantCountry extends Mage_Core_Model_Config_Data { @@ -32,6 +37,7 @@ class Mage_Paypal_Model_System_Config_Backend_MerchantCountry extends Mage_Core_ /** * Substitute empty value with Default country. + * @return $this */ protected function _afterLoad() { @@ -45,5 +51,6 @@ protected function _afterLoad() } $this->setValue($defaultCountry); } + return $this; } } diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php index 60573c0ba54..6a0dd4b48ad 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/AuthorizationAmounts.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php index e293e73d297..0a96ccc50db 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlPosition.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php index 43e1419900b..1fdaef6cf73 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/BmlSize.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php index d08ab47504d..786506586c1 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/BuyerCountry.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php index 28435cb24b0..8edd31d8635 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/FetchingSchedule.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php index 84374230681..f36dd81cf55 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/Logo.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model for available logo types + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_Logo { diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php index 4d7da72d961..a8ae1227ca8 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/MerchantCountry.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model for merchant countries supported by PayPal + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_MerchantCountry { diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php index b179b32093d..63707e2b525 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions.php @@ -7,25 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model for available payment actions + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_PaymentActions { /** - * Options getter - * * @return array */ public function toOptionArray() diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php index 7511602d5e8..6c9ba541584 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/PaymentActions/Express.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php b/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php index 473bb852795..cdf2842553d 100644 --- a/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php +++ b/app/code/core/Mage/Paypal/Model/System/Config/Source/RequireBillingAddress.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Source model for Require Billing Address + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Model_System_Config_Source_RequireBillingAddress { 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..a0b3ec31d52 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 @@ -7,25 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..1b3f89175e5 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 @@ -7,26 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +38,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..626c653a2e2 100644 --- a/app/code/core/Mage/Paypal/UnavailableException.php +++ b/app/code/core/Mage/Paypal/UnavailableException.php @@ -7,18 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Adminhtml/Paypal/ReportsController.php b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php index 33b14df8d2f..9cf989d25cf 100644 --- a/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php +++ b/app/code/core/Mage/Paypal/controllers/Adminhtml/Paypal/ReportsController.php @@ -7,27 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Settlement Reports Controller * - * @category Mage - * @package Mage_Paypal - * @author Magento Core Team + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_Adminhtml_Paypal_ReportsController extends Mage_Adminhtml_Controller_Action { - /** * Grid action */ diff --git a/app/code/core/Mage/Paypal/controllers/BmlController.php b/app/code/core/Mage/Paypal/controllers/BmlController.php index 051f184e18b..610806cd6e8 100644 --- a/app/code/core/Mage/Paypal/controllers/BmlController.php +++ b/app/code/core/Mage/Paypal/controllers/BmlController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/ExpressController.php b/app/code/core/Mage/Paypal/controllers/ExpressController.php index 12303bdd13d..09a24c7bcb9 100644 --- a/app/code/core/Mage/Paypal/controllers/ExpressController.php +++ b/app/code/core/Mage/Paypal/controllers/ExpressController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/controllers/HostedproController.php b/app/code/core/Mage/Paypal/controllers/HostedproController.php index f1fdd2a1d11..320803a1cc7 100644 --- a/app/code/core/Mage/Paypal/controllers/HostedproController.php +++ b/app/code/core/Mage/Paypal/controllers/HostedproController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,7 +57,7 @@ public function cancelAction() * Cancel order, return quote to customer * * @param string $errorMsg - * @return mixed + * @return false|string */ protected function _cancelPayment($errorMsg = '') { diff --git a/app/code/core/Mage/Paypal/controllers/IpnController.php b/app/code/core/Mage/Paypal/controllers/IpnController.php index 85a6c56cc35..de4071b5d92 100644 --- a/app/code/core/Mage/Paypal/controllers/IpnController.php +++ b/app/code/core/Mage/Paypal/controllers/IpnController.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Unified IPN controller for all supported PayPal methods + * + * @category Mage + * @package Mage_Paypal + * @author Magento Core Team */ class Mage_Paypal_IpnController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Paypal/controllers/PayflowController.php b/app/code/core/Mage/Paypal/controllers/PayflowController.php index b62f57ecd53..ee0f3540e36 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -106,7 +107,7 @@ public function silentPostAction() * Cancel order, return quote to customer * * @param string $errorMsg - * @return mixed + * @return false|string */ protected function _cancelPayment($errorMsg = '') { diff --git a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php index 08914e32839..3262aafcf7e 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Paypal/controllers/StandardController.php b/app/code/core/Mage/Paypal/controllers/StandardController.php index 651289d2bf1..bbe81122302 100644 --- a/app/code/core/Mage/Paypal/controllers/StandardController.php +++ b/app/code/core/Mage/Paypal/controllers/StandardController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/data/paypal_setup/data-install-1.6.0.5.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php index cf01b466ac4..abab64d52bb 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-install-1.6.0.5.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php index e957e5bfdde..616cbc706d5 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php index 7aeffd5588d..057830c40b6 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.4-1.6.0.5.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php index 2b5ebf93f73..c72a59a8268 100644 --- a/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php +++ b/app/code/core/Mage/Paypal/data/paypal_setup/data-upgrade-1.6.0.5-1.6.0.6.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/etc/adminhtml.xml b/app/code/core/Mage/Paypal/etc/adminhtml.xml index 1b87b598e98..9693733f971 100644 --- a/app/code/core/Mage/Paypal/etc/adminhtml.xml +++ b/app/code/core/Mage/Paypal/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 6385961cee2..f637ee83ef3 100644 --- a/app/code/core/Mage/Paypal/etc/config.xml +++ b/app/code/core/Mage/Paypal/etc/config.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. (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/Paypal/etc/system.xml b/app/code/core/Mage/Paypal/etc/system.xml index fa6c03181c7..a97c4868fc5 100644 --- a/app/code/core/Mage/Paypal/etc/system.xml +++ b/app/code/core/Mage/Paypal/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php index 70bf2274816..e641f4b1225 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php index 3fa20b5ac07..9a857b13ebc 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Paypal_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php index b1435f3311b..d6d1b7fd8a1 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-install-1.4.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Paypal_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php index e8223aac6fa..ab793f26a0a 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,18 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; + /** @var Mage_Paypal_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->addAttribute('order', 'paypal_ipn_customer_notified', ['type'=>'int', 'visible' => false, 'default' => 0]); $installer->endSetup(); diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php index 5ec80520909..30a41a832d1 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Paypal_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->addAttribute('order_payment', 'cc_secure_verify', []); diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index 0f9afd777f6..f6767bbaa7c 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Paypal_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 602a284cbd5..9e7e1ae3128 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 54b0cea83df..8894c64ba7f 100644 --- a/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Paypal/sql/paypal_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/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..ea81777b468 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..3293fe75634 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..907e1b36028 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Paypal + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Bml/Form.php b/app/code/core/Mage/PaypalUk/Block/Bml/Form.php index 407c033717e..4fe4a86bbbf 100644 --- a/app/code/core/Mage/PaypalUk/Block/Bml/Form.php +++ b/app/code/core/Mage/PaypalUk/Block/Bml/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Form.php b/app/code/core/Mage/PaypalUk/Block/Express/Form.php index dc50c4de60a..1a54504a883 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Form.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php b/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php index 160a231d4c7..5effec2edf0 100644 --- a/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php +++ b/app/code/core/Mage/PaypalUk/Block/Express/Shortcut.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..ca343c9f67a 100644 --- a/app/code/core/Mage/PaypalUk/Helper/Data.php +++ b/app/code/core/Mage/PaypalUk/Helper/Data.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PaypalUk data helper * - * @category Mage - * @package Mage_PaypalUk - * @author Magento Core Team + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_PaypalUk'; } diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php b/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php index cef66a4e931..22d3a938ddb 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Express/Nvp.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Payflow Express NVP API wrappers model + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Api_Express_Nvp extends Mage_PaypalUk_Model_Api_Nvp { diff --git a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php index 01d9bc75ad2..5c50d787e88 100644 --- a/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php +++ b/app/code/core/Mage/PaypalUk/Model/Api/Nvp.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * NVP API wrappers model + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Api_Nvp extends Mage_Paypal_Model_Api_Nvp { @@ -427,8 +432,8 @@ protected function _addMethodToRequest($methodName, $request) /** * Return Payflow Edition * - * @param string - * @return string | null + * @param string $methodName + * @return string|null */ protected function _getPaypalUkActionName($methodName) { @@ -471,8 +476,8 @@ protected function _mapPaypalMethodName($methodName) /** * Catch success calls and collect warnings * - * @param array - * @return bool| success flag + * @param array $response + * @return bool success flag */ protected function _isCallSuccessful($response) { @@ -490,7 +495,7 @@ protected function _isCallSuccessful($response) /** * Handle logical errors * - * @param array + * @param array $response */ protected function _handleCallErrors($response) { @@ -522,7 +527,7 @@ protected function _buildQuery($request) /** * Generate Request ID * - * @return + * @return string */ protected function getRequestId() { diff --git a/app/code/core/Mage/PaypalUk/Model/Bml.php b/app/code/core/Mage/PaypalUk/Model/Bml.php index 24968697339..47ae8028c1d 100644 --- a/app/code/core/Mage/PaypalUk/Model/Bml.php +++ b/app/code/core/Mage/PaypalUk/Model/Bml.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Model/Direct.php b/app/code/core/Mage/PaypalUk/Model/Direct.php index 20481b41bb9..a0e50af817d 100644 --- a/app/code/core/Mage/PaypalUk/Model/Direct.php +++ b/app/code/core/Mage/PaypalUk/Model/Direct.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -71,8 +72,8 @@ public function getIsCentinelValidationEnabled() /** * Import direct payment results to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment */ protected function _importResultToPayment($api, $payment) { diff --git a/app/code/core/Mage/PaypalUk/Model/Express.php b/app/code/core/Mage/PaypalUk/Model/Express.php index 2e796f6faf6..0426527e804 100644 --- a/app/code/core/Mage/PaypalUk/Model/Express.php +++ b/app/code/core/Mage/PaypalUk/Model/Express.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,8 +69,8 @@ public function isAvailable($quote = null) /** * Import payment info to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment */ protected function _importToPayment($api, $payment) { diff --git a/app/code/core/Mage/PaypalUk/Model/Express/Checkout.php b/app/code/core/Mage/PaypalUk/Model/Express/Checkout.php index b89fa6d4ed7..2f71c24c1cb 100644 --- a/app/code/core/Mage/PaypalUk/Model/Express/Checkout.php +++ b/app/code/core/Mage/PaypalUk/Model/Express/Checkout.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/Model/Express/Pro.php b/app/code/core/Mage/PaypalUk/Model/Express/Pro.php index 7134014228e..2cd9e169b53 100644 --- a/app/code/core/Mage/PaypalUk/Model/Express/Pro.php +++ b/app/code/core/Mage/PaypalUk/Model/Express/Pro.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Express (Payflow Edition) implementation for payment method instances + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Express_Pro extends Mage_PaypalUk_Model_Pro { diff --git a/app/code/core/Mage/PaypalUk/Model/Pro.php b/app/code/core/Mage/PaypalUk/Model/Pro.php index 4ebf2437d5d..0263712d756 100644 --- a/app/code/core/Mage/PaypalUk/Model/Pro.php +++ b/app/code/core/Mage/PaypalUk/Model/Pro.php @@ -7,21 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * PayPal Website Payments Pro (Payflow Edition) implementation for payment method instances * This model was created because right now PayPal Direct and PayPal Express payment * (Payflow Edition) methods cannot have same abstract + * + * @category Mage + * @package Mage_PaypalUk + * @author Magento Core Team */ class Mage_PaypalUk_Model_Pro extends Mage_Paypal_Model_Pro { @@ -89,8 +94,8 @@ protected function _getParentTransactionId(Varien_Object $payment) /** * Import capture results to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment */ protected function _importCaptureResultToPayment($api, $payment) { @@ -124,8 +129,8 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact /** * Import refund results to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment * @param bool $canRefundMore */ protected function _importRefundResultToPayment($api, $payment, $canRefundMore) diff --git a/app/code/core/Mage/PaypalUk/Model/Session.php b/app/code/core/Mage/PaypalUk/Model/Session.php index 61c1aeb419e..01e385a166d 100644 --- a/app/code/core/Mage/PaypalUk/Model/Session.php +++ b/app/code/core/Mage/PaypalUk/Model/Session.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/controllers/BmlController.php b/app/code/core/Mage/PaypalUk/controllers/BmlController.php index 79904678fca..65f846227ec 100644 --- a/app/code/core/Mage/PaypalUk/controllers/BmlController.php +++ b/app/code/core/Mage/PaypalUk/controllers/BmlController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php index 34d7131ab4b..25cc7363c8a 100644 --- a/app/code/core/Mage/PaypalUk/controllers/ExpressController.php +++ b/app/code/core/Mage/PaypalUk/controllers/ExpressController.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/etc/config.xml b/app/code/core/Mage/PaypalUk/etc/config.xml index 5f3c3c734f8..117c3f72735 100644 --- a/app/code/core/Mage/PaypalUk/etc/config.xml +++ b/app/code/core/Mage/PaypalUk/etc/config.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_PaypalUk - * @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_PaypalUk + * @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/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php index f2ea73e307e..92a805f60cb 100644 --- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_PaypalUk - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php index 3a3bd29b257..75b9f041a4f 100644 --- a/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/PaypalUk/sql/paypaluk_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_PaypalUk + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Paypal_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Persistent/Block/Form/Remember.php b/app/code/core/Mage/Persistent/Block/Form/Remember.php index 49fb3328a89..7ed176224ee 100644 --- a/app/code/core/Mage/Persistent/Block/Form/Remember.php +++ b/app/code/core/Mage/Persistent/Block/Form/Remember.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Remember Me block * - * @category Mage - * @package Mage_Persistent - * @author Magento Core Team + * @category Mage + * @package Mage_Persistent + * @author Magento Core Team */ - class Mage_Persistent_Block_Form_Remember extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Persistent/Block/Header/Additional.php b/app/code/core/Mage/Persistent/Block/Header/Additional.php index f81ddb02138..1db210c3f9b 100644 --- a/app/code/core/Mage/Persistent/Block/Header/Additional.php +++ b/app/code/core/Mage/Persistent/Block/Header/Additional.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Persistent/Helper/Data.php b/app/code/core/Mage/Persistent/Helper/Data.php index 719da1828f7..aa3d5d212cd 100644 --- a/app/code/core/Mage/Persistent/Helper/Data.php +++ b/app/code/core/Mage/Persistent/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,6 +38,8 @@ class Mage_Persistent_Helper_Data extends Mage_Core_Helper_Data const LOGGED_IN_LAYOUT_HANDLE = 'customer_logged_in_psc_handle'; const LOGGED_OUT_LAYOUT_HANDLE = 'customer_logged_out_psc_handle'; + protected $_moduleName = 'Mage_Persistent'; + /** * Name of config file * diff --git a/app/code/core/Mage/Persistent/Helper/Session.php b/app/code/core/Mage/Persistent/Helper/Session.php index 23ed71fa0f0..898d05fb9ef 100644 --- a/app/code/core/Mage/Persistent/Helper/Session.php +++ b/app/code/core/Mage/Persistent/Helper/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,8 @@ */ class Mage_Persistent_Helper_Session extends Mage_Core_Helper_Data { + protected $_moduleName = 'Mage_Persistent'; + /** * Instance of Session Model * diff --git a/app/code/core/Mage/Persistent/Model/Observer.php b/app/code/core/Mage/Persistent/Model/Observer.php index 0c516c77c02..c3f38c3d573 100644 --- a/app/code/core/Mage/Persistent/Model/Observer.php +++ b/app/code/core/Mage/Persistent/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..a2e3647e643 100644 --- a/app/code/core/Mage/Persistent/Model/Observer/Session.php +++ b/app/code/core/Mage/Persistent/Model/Observer/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Persistent/Model/Persistent/Config.php b/app/code/core/Mage/Persistent/Model/Persistent/Config.php index 57703d44dc2..643b3259c13 100644 --- a/app/code/core/Mage/Persistent/Model/Persistent/Config.php +++ b/app/code/core/Mage/Persistent/Model/Persistent/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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..0e872176c6f 100644 --- a/app/code/core/Mage/Persistent/Model/Resource/Session.php +++ b/app/code/core/Mage/Persistent/Model/Resource/Session.php @@ -7,36 +7,34 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { /** * Use is object new method for object saving * - * @var boolean + * @var bool */ 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..8e3273c81e9 100644 --- a/app/code/core/Mage/Persistent/Model/Session.php +++ b/app/code/core/Mage/Persistent/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Persistent + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -91,7 +92,10 @@ public function getLoadExpired() */ public function getExpiredBefore($store = null) { - return gmdate('Y-m-d H:i:s', time() - Mage::helper('persistent')->getLifeTime($store)); + return gmdate( + Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, + time() - Mage::helper('persistent')->getLifeTime($store) + ); } /** @@ -218,7 +222,7 @@ public function deleteExpired($websiteId = null) if ($lifetime) { $this->getResource()->deleteExpired( $websiteId, - gmdate('Y-m-d H:i:s', time() - $lifetime) + gmdate(Varien_Date::DATETIME_PHP_FORMAT, time() - $lifetime) ); } @@ -243,7 +247,7 @@ protected function _afterDeleteCommit() */ public function save() { - $this->setUpdatedAt(gmdate('Y-m-d H:i:s')); + $this->setUpdatedAt(gmdate(Varien_Date::DATETIME_PHP_FORMAT)); return parent::save(); } } diff --git a/app/code/core/Mage/Persistent/controllers/IndexController.php b/app/code/core/Mage/Persistent/controllers/IndexController.php index ad998187373..f3c01a4bfbc 100644 --- a/app/code/core/Mage/Persistent/controllers/IndexController.php +++ b/app/code/core/Mage/Persistent/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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 9b44170d43f..c9b0132e1bd 100644 --- a/app/code/core/Mage/Persistent/etc/adminhtml.xml +++ b/app/code/core/Mage/Persistent/etc/adminhtml.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. (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/Persistent/etc/config.xml b/app/code/core/Mage/Persistent/etc/config.xml index ca4e9aef510..651e76ce6cf 100644 --- a/app/code/core/Mage/Persistent/etc/config.xml +++ b/app/code/core/Mage/Persistent/etc/config.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. (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/Persistent/etc/persistent.xml b/app/code/core/Mage/Persistent/etc/persistent.xml index 53ab3612cf7..8bd8b960b08 100644 --- a/app/code/core/Mage/Persistent/etc/persistent.xml +++ b/app/code/core/Mage/Persistent/etc/persistent.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. (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/Persistent/etc/system.xml b/app/code/core/Mage/Persistent/etc/system.xml index 793bee7fcf4..b6c158d254d 100644 --- a/app/code/core/Mage/Persistent/etc/system.xml +++ b/app/code/core/Mage/Persistent/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php b/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php index 917d96d3b34..e9c1f4ca05c 100644 --- a/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php +++ b/app/code/core/Mage/Persistent/sql/persistent_setup/install-1.0.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Block/ActivePoll.php b/app/code/core/Mage/Poll/Block/ActivePoll.php index 73b83e347d5..2d180ba0469 100644 --- a/app/code/core/Mage/Poll/Block/ActivePoll.php +++ b/app/code/core/Mage/Poll/Block/ActivePoll.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Block/Poll.php b/app/code/core/Mage/Poll/Block/Poll.php index ec3c59361d8..e45772c2cd4 100644 --- a/app/code/core/Mage/Poll/Block/Poll.php +++ b/app/code/core/Mage/Poll/Block/Poll.php @@ -7,24 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * Poll block - * - * @file Poll.php - * @author Magento Core Team + * @category Mage + * @package Mage_Adminhtml + * @author Magento Core Team */ - class Mage_Poll_Block_Poll extends Mage_Core_Block_Template { public function __construct() diff --git a/app/code/core/Mage/Poll/Helper/Data.php b/app/code/core/Mage/Poll/Helper/Data.php index 684437b57c0..47e7f3ab7d7 100644 --- a/app/code/core/Mage/Poll/Helper/Data.php +++ b/app/code/core/Mage/Poll/Helper/Data.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Poll'; } diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php index df1c0b2ec4d..4dcf14030b6 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Poll Mysql4 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 extends Mage_Poll_Model_Resource_Poll diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php index 3a8c2566f81..6c6cb6945f3 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php index b116316652b..f5ca4d3883a 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Answer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php index 3c61333e784..6b29ddaae8c 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..af5e474a13d 100644 --- a/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Mysql4/Poll/Vote.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Poll/Model/Poll.php index dccbab020c1..b92c03e9fda 100644 --- a/app/code/core/Mage/Poll/Model/Poll.php +++ b/app/code/core/Mage/Poll/Model/Poll.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Poll model * + * @category Mage + * @package Mage_Poll + * @author Magento Core Team + * * @method Mage_Poll_Model_Resource_Poll _getResource() * @method Mage_Poll_Model_Resource_Poll getResource() * @method Mage_Poll_Model_Resource_Poll_Collection getCollection() @@ -45,12 +50,7 @@ * @method int getStoreFilter() * @method $this setStoreFilter(int $value) * @method $this setVotesCount(int $value) - * - * @category Mage - * @package Mage_Poll - * @author Magento Core Team */ - class Mage_Poll_Model_Poll extends Mage_Core_Model_Abstract { const XML_PATH_POLL_CHECK_BY_IP = 'web/polls/poll_check_by_ip'; diff --git a/app/code/core/Mage/Poll/Model/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Poll/Answer.php index aefb06702e3..a79d2ff7e11 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Poll/Answer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Poll/Vote.php b/app/code/core/Mage/Poll/Model/Poll/Vote.php index 38d40b8abd5..3e177bcf018 100644 --- a/app/code/core/Mage/Poll/Model/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Poll/Vote.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 +39,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.php b/app/code/core/Mage/Poll/Model/Resource/Poll.php index fcdce100e77..90de70d8b6f 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Poll Mysql4 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 extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php index 4561f0bbaec..902d6e19364 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php index 04722a4d42c..94b29e582be 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Answer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php b/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php index 2793b04f3ac..66c159a4c79 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..9c05a17d4c2 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll/Vote.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2c197327311 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/data/poll_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php index cd511c6c9cf..cdcb2998e6c 100644 --- a/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Poll/data/poll_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/etc/adminhtml.xml b/app/code/core/Mage/Poll/etc/adminhtml.xml index e131584562a..5652a093752 100644 --- a/app/code/core/Mage/Poll/etc/adminhtml.xml +++ b/app/code/core/Mage/Poll/etc/adminhtml.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. (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/Poll/etc/config.xml b/app/code/core/Mage/Poll/etc/config.xml index 90dd1b423d9..96c6f16bc50 100644 --- a/app/code/core/Mage/Poll/etc/config.xml +++ b/app/code/core/Mage/Poll/etc/config.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. (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/Poll/etc/system.xml b/app/code/core/Mage/Poll/etc/system.xml index 7ca21367152..717a8ac847c 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. (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/Poll/sql/poll_setup/install-1.6.0.0.php b/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php index 1df368b4f69..d27e452a851 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php index 1a500c67818..de5a88813fc 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php index e2ffcb29716..d9b292a9174 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.6.0-0.6.1.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $conn->dropForeignKey('poll_answer', 'FK_POLL_PARENT'); diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php index ce488e5de36..2b5e9dcc5b7 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Poll - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index f140c547ddb..1af34a64f5d 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php index 7bef2f0a844..1ca37168ac8 100644 --- a/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Poll/sql/poll_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Poll + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/ProductAlert/Block/Email/Abstract.php b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php index 60d3499ee9d..fe4685a4b27 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -78,8 +79,8 @@ public function getStore() * Convert price from default currency to current currency * * @param double $price - * @param boolean $format Format price to currency format - * @param boolean $includeContainer Enclose into + * @param bool $format Format price to currency format + * @param bool $includeContainer Enclose into * @return double */ public function formatPrice($price, $format = true, $includeContainer = true) diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Price.php b/app/code/core/Mage/ProductAlert/Block/Email/Price.php index 38369e39899..c84df775d83 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,14 +24,10 @@ * * @category Mage * @package Mage_ProductAlert - * @author Magento Core Team + * @author Magento Core Team */ class Mage_ProductAlert_Block_Email_Price extends Mage_ProductAlert_Block_Email_Abstract { - /** - * Constructor - * - */ public function __construct() { parent::__construct(); diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php index 14b799bc652..5e994906a50 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,14 +24,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/Price.php b/app/code/core/Mage/ProductAlert/Block/Price.php index ea205963836..f8e2dfd1024 100644 --- a/app/code/core/Mage/ProductAlert/Block/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Price.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 */ class Mage_ProductAlert_Block_Price extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/ProductAlert/Block/Product/View.php b/app/code/core/Mage/ProductAlert/Block/Product/View.php index 12984edabff..95ec3bd947a 100644 --- a/app/code/core/Mage/ProductAlert/Block/Product/View.php +++ b/app/code/core/Mage/ProductAlert/Block/Product/View.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ffdb49eea53 100644 --- a/app/code/core/Mage/ProductAlert/Block/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Stock.php @@ -7,18 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Helper/Data.php b/app/code/core/Mage/ProductAlert/Helper/Data.php index 72b94b362b3..0ae71e60f16 100644 --- a/app/code/core/Mage/ProductAlert/Helper/Data.php +++ b/app/code/core/Mage/ProductAlert/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_ProductAlert_Helper_Data extends Mage_Core_Helper_Url { + protected $_moduleName = 'Mage_ProductAlert'; + /** * Current product instance (override registry one) * diff --git a/app/code/core/Mage/ProductAlert/Model/Email.php b/app/code/core/Mage/ProductAlert/Model/Email.php index eb7ac469c13..42dde2abf5f 100644 --- a/app/code/core/Mage/ProductAlert/Model/Email.php +++ b/app/code/core/Mage/ProductAlert/Model/Email.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php index 6c06bb35833..151c2b4d820 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product alert for changed price 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_Price extends Mage_ProductAlert_Model_Resource_Price diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php index 6f72b9d7b90..4ff5e31a452 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php index b5fa0a36414..d06aef700aa 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Price/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php index b2306c60c55..254af567433 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php index 4e476a4242f..f093b4d81eb 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php index d9054b642f8..0cef7569d5d 100644 --- a/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Mysql4/Stock/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Observer.php b/app/code/core/Mage/ProductAlert/Model/Observer.php index 1f7303d59ed..4e94522271a 100644 --- a/app/code/core/Mage/ProductAlert/Model/Observer.php +++ b/app/code/core/Mage/ProductAlert/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/ProductAlert/Model/Price.php b/app/code/core/Mage/ProductAlert/Model/Price.php index fc79091047a..d370446d908 100644 --- a/app/code/core/Mage/ProductAlert/Model/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Price.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * ProductAlert for changed price model * + * @category Mage + * @package Mage_ProductAlert + * @author Magento Core Team + * * @method Mage_ProductAlert_Model_Resource_Price _getResource() * @method Mage_ProductAlert_Model_Resource_Price getResource() * @method Mage_ProductAlert_Model_Resource_Price_Collection getCollection() @@ -41,10 +46,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_Price extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php index 1a155c0fbc1..3b97f5e7ceb 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php index 4e5fa98ecd0..0d2ecc8268f 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product alert for changed price 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_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/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php index 6f0fcb54720..75ac0ff3f80 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php index 411d650df73..a38423011ae 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php index 001648f2684..8a1b82cea67 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Resource/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php index 3375b83b0bd..a0c7572f96f 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php index 74a6afef8d1..54fa4522b30 100644 --- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php +++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/Model/Stock.php b/app/code/core/Mage/ProductAlert/Model/Stock.php index 0f37f5ed03c..8bde9a5af64 100644 --- a/app/code/core/Mage/ProductAlert/Model/Stock.php +++ b/app/code/core/Mage/ProductAlert/Model/Stock.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 +44,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/AddController.php b/app/code/core/Mage/ProductAlert/controllers/AddController.php index fcf1ec2d98a..f1a9fba0eca 100644 --- a/app/code/core/Mage/ProductAlert/controllers/AddController.php +++ b/app/code/core/Mage/ProductAlert/controllers/AddController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,7 +29,7 @@ class Mage_ProductAlert_AddController extends Mage_Core_Controller_Front_Action { /** - * @return Mage_Core_Controller_Front_Action|void + * @return void */ public function preDispatch() { diff --git a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php index 8ad4ed506f2..785852c1bf2 100644 --- a/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php +++ b/app/code/core/Mage/ProductAlert/controllers/UnsubscribeController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_ProductAlert - * @author Magento Core Team + * @author Magento Core Team */ class Mage_ProductAlert_UnsubscribeController extends Mage_Core_Controller_Front_Action { @@ -37,6 +38,7 @@ public function preDispatch() Mage::getSingleton('customer/session')->setBeforeUrl($this->_getRefererUrl()); } } + return $this; } public function priceAction() diff --git a/app/code/core/Mage/ProductAlert/etc/config.xml b/app/code/core/Mage/ProductAlert/etc/config.xml index f07a7688b51..d65ddf49b74 100644 --- a/app/code/core/Mage/ProductAlert/etc/config.xml +++ b/app/code/core/Mage/ProductAlert/etc/config.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. (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/ProductAlert/etc/system.xml b/app/code/core/Mage/ProductAlert/etc/system.xml index 4a4dc568eee..759a055322b 100644 --- a/app/code/core/Mage/ProductAlert/etc/system.xml +++ b/app/code/core/Mage/ProductAlert/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php index ab196ec51de..e230a7093d6 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php index 19d43d0d560..0a9e5f8f00e 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-install-0.7.0.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * ProductAlert Install - * * @category Mage * @package Mage_ProductAlert - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ +/** @var Mage_Core_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('product_alert_price')}`; CREATE TABLE IF NOT EXISTS `{$installer->getTable('product_alert_price')}` ( diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php index 689235cd1b1..8250c7e8f52 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + // fix for sample data 1.2.0 $installer->getConnection()->changeTableEngine($installer->getTable('productalert/stock'), 'INNODB'); $installer->getConnection()->dropKey($installer->getTable('productalert/stock'), 'FK_PRODUCT_ALERT_PRICE_CUSTOMER'); diff --git a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 16eb76529d8..741d0ba01c5 100644 --- a/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/ProductAlert/sql/productalert_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_ProductAlert + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Rating/Block/Entity/Detailed.php b/app/code/core/Mage/Rating/Block/Entity/Detailed.php index 6d0f63549fc..e7f3fd9ad85 100644 --- a/app/code/core/Mage/Rating/Block/Entity/Detailed.php +++ b/app/code/core/Mage/Rating/Block/Entity/Detailed.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Helper/Data.php b/app/code/core/Mage/Rating/Helper/Data.php index 23ab7ab656f..7899091a2f3 100644 --- a/app/code/core/Mage/Rating/Helper/Data.php +++ b/app/code/core/Mage/Rating/Helper/Data.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Rating'; } diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php index 57e28158daf..7e67d42c2a2 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating 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 extends Mage_Rating_Model_Resource_Rating diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php index f2e8fa710c3..b6e6b60f5ae 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php index 40f728d598e..a5725082455 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php index 7bbea92203e..2a69a59bba5 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating option 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 extends Mage_Rating_Model_Resource_Rating_Option diff --git a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php index a234d6da097..4ab303df974 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..b0edb3f30f8 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php index 6dd5f055f93..d554a7a51dc 100644 --- a/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Mysql4/Rating/Option/Vote/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Observer.php b/app/code/core/Mage/Rating/Model/Observer.php index 055d766691a..246e1bece60 100644 --- a/app/code/core/Mage/Rating/Model/Observer.php +++ b/app/code/core/Mage/Rating/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rating/Model/Rating.php b/app/code/core/Mage/Rating/Model/Rating.php index 20f3a8e794d..b012ce88b04 100644 --- a/app/code/core/Mage/Rating/Model/Rating.php +++ b/app/code/core/Mage/Rating/Model/Rating.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating model * + * @category Mage + * @package Mage_Rating + * @author Magento Core Team + * * @method Mage_Rating_Model_Resource_Rating getResource() * @method Mage_Rating_Model_Resource_Rating _getResource() * @method Mage_Rating_Model_Resource_Rating_Collection getCollection() @@ -49,10 +54,6 @@ * @method $this setSum(int $value) * @method $this setSummary(float|int $param) * @method int getVoteId() - * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team */ class Mage_Rating_Model_Rating extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Rating/Model/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Rating/Entity.php index 33f73250f3a..712ce45b77a 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Rating/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Rating/Option.php b/app/code/core/Mage/Rating/Model/Rating/Option.php index c5514f92f64..5adf73b16c8 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating option model * + * @category Mage + * @package Mage_Rating + * @author Magento Core Team + * * @method Mage_Rating_Model_Resource_Rating_Option_Collection getResourceCollection() * @method Mage_Rating_Model_Resource_Rating_Option _getResource() * @method Mage_Rating_Model_Resource_Rating_Option getResource() @@ -41,10 +46,6 @@ * @method $this setValue(int $value) * @method int getVoteId() * @method $this setVoteId(int $value) - * - * @category Mage - * @package Mage_Rating - * @author Magento Core Team */ class Mage_Rating_Model_Rating_Option extends Mage_Core_Model_Abstract { 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..4df629e1993 100644 --- a/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php +++ b/app/code/core/Mage/Rating/Model/Rating/Option/Vote.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,14 +24,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.php b/app/code/core/Mage/Rating/Model/Resource/Rating.php index f7f8d95c046..17a30bea01f 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating.php @@ -7,31 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating 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 extends Mage_Core_Model_Resource_Db_Abstract { const RATING_STATUS_APPROVED = 'Approved'; - /** - * Resource initialization - */ protected function _construct() { $this->_init('rating/rating', 'rating_id'); @@ -246,7 +244,7 @@ protected function _afterDelete(Mage_Core_Model_Abstract $object) * Return array of rating summary * * @param Mage_Rating_Model_Rating $object - * @param boolean $onlyForCurrentStore + * @param bool $onlyForCurrentStore * @return array|Mage_Rating_Model_Rating */ public function getEntitySummary($object, $onlyForCurrentStore = true) @@ -348,7 +346,7 @@ protected function _getEntitySummaryData($object) * Review summary * * @param Mage_Rating_Model_Rating $object - * @param boolean $onlyForCurrentStore + * @param bool $onlyForCurrentStore * @return array|Mage_Rating_Model_Rating */ public function getReviewSummary($object, $onlyForCurrentStore = true) diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php index 2540e956bf0..b199d678370 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,10 +35,6 @@ class Mage_Rating_Model_Resource_Rating_Collection extends Mage_Core_Model_Resou */ protected $_isStoreJoined = false; - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('rating/rating'); diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php index 43c14b2bec9..a42de1b361f 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Entity.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php index 7f0b53e0db4..7e0760018ea 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rating option 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 extends Mage_Core_Model_Resource_Db_Abstract { @@ -83,10 +84,6 @@ class Mage_Rating_Model_Resource_Rating_Option extends Mage_Core_Model_Resource_ */ protected $_optionId; - /** - * Resource initialization. Define other tables name - * - */ protected function _construct() { $this->_init('rating/rating_option', 'option_id'); diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php index eb7ec95d0e3..b817c246f43 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..9e2e877db28 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 @@ -7,30 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php index cc5cef92b03..c5a43914d1c 100644 --- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php +++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Vote/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php index 6d81a5906aa..ddd6431338b 100644 --- a/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Rating/data/rating_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/etc/adminhtml.xml b/app/code/core/Mage/Rating/etc/adminhtml.xml index 3cf20f342c9..79371deab31 100644 --- a/app/code/core/Mage/Rating/etc/adminhtml.xml +++ b/app/code/core/Mage/Rating/etc/adminhtml.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_Rating - * @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_Rating + * @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/Rating/etc/config.xml b/app/code/core/Mage/Rating/etc/config.xml index 06019af9e87..a5f2ee5ebba 100644 --- a/app/code/core/Mage/Rating/etc/config.xml +++ b/app/code/core/Mage/Rating/etc/config.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_Rating - * @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_Rating + * @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/Rating/sql/rating_setup/install-1.6.0.0.php b/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php index 3a492f0e3bb..f346af7102e 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rating - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php index 07a88e889e8..8fe28506cf2 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php index 813ca4e02df..8ece0fd1f0e 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Rating - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php index 48e55b73384..321979d5f86 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index d3c8be266a8..42cd000df5d 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php index 5e6e6b46fa5..70cbab834d6 100644 --- a/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Rating/sql/rating_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rating + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php index 8b214699a5b..fbff8ed9d2f 100644 --- a/app/code/core/Mage/Reports/Block/Product/Abstract.php +++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Compared.php b/app/code/core/Mage/Reports/Block/Product/Compared.php index a1ef06a76a7..719e90c799b 100644 --- a/app/code/core/Mage/Reports/Block/Product/Compared.php +++ b/app/code/core/Mage/Reports/Block/Product/Compared.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Viewed.php b/app/code/core/Mage/Reports/Block/Product/Viewed.php index 5b08e97ab6b..acbdfb1fa52 100644 --- a/app/code/core/Mage/Reports/Block/Product/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Viewed.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Compared.php b/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php index 39d8a8ff23b..7a1b15e5f89 100644 --- a/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php +++ b/app/code/core/Mage/Reports/Block/Product/Widget/Compared.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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..3be9ba1eaa3 100644 --- a/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php +++ b/app/code/core/Mage/Reports/Block/Product/Widget/Viewed.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,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/Exception.php b/app/code/core/Mage/Reports/Exception.php index ba2d22d1c3c..bb34fa5defb 100644 --- a/app/code/core/Mage/Reports/Exception.php +++ b/app/code/core/Mage/Reports/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php index 5f0c5206a88..c6dd4eedabe 100644 --- a/app/code/core/Mage/Reports/Helper/Data.php +++ b/app/code/core/Mage/Reports/Helper/Data.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -31,10 +32,12 @@ class Mage_Reports_Helper_Data extends Mage_Core_Helper_Abstract const XML_PATH_REPORTS_ENABLED = 'reports/general/enabled'; + protected $_moduleName = 'Mage_Reports'; + /** * Return reports flag enabled. * - * @return boolean + * @return bool */ public function isReportsEnabled() diff --git a/app/code/core/Mage/Reports/Model/Config.php b/app/code/core/Mage/Reports/Model/Config.php index 568a53c5b8b..9ccc4dd606c 100644 --- a/app/code/core/Mage/Reports/Model/Config.php +++ b/app/code/core/Mage/Reports/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Event.php b/app/code/core/Mage/Reports/Model/Event.php index 39b8bacfb5d..6eaf612914b 100644 --- a/app/code/core/Mage/Reports/Model/Event.php +++ b/app/code/core/Mage/Reports/Model/Event.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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/Observer.php b/app/code/core/Mage/Reports/Model/Event/Observer.php index e8a239f550d..72c3e17e4c1 100644 --- a/app/code/core/Mage/Reports/Model/Event/Observer.php +++ b/app/code/core/Mage/Reports/Model/Event/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Reports/Model/Event/Type.php b/app/code/core/Mage/Reports/Model/Event/Type.php index bdaa4994ccc..6b220ebbf21 100644 --- a/app/code/core/Mage/Reports/Model/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Event/Type.php @@ -7,32 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Flag.php b/app/code/core/Mage/Reports/Model/Flag.php index 8df9a3ea3b6..8d1b9ef1ca4 100644 --- a/app/code/core/Mage/Reports/Model/Flag.php +++ b/app/code/core/Mage/Reports/Model/Flag.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Grouped/Collection.php b/app/code/core/Mage/Reports/Model/Grouped/Collection.php index 1a84529476b..8da36401e8f 100644 --- a/app/code/core/Mage/Reports/Model/Grouped/Collection.php +++ b/app/code/core/Mage/Reports/Model/Grouped/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,8 +55,8 @@ public function setColumnGroupBy($column) /** * Load collection * - * @param boolean $printQuery - * @param boolean $logQuery + * @param bool $printQuery + * @param bool $logQuery * @return $this */ public function load($printQuery = false, $logQuery = false) diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php index b1b89be64d5..ab10e750ac1 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Accounts/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php index 1a22f2ec5b4..cd337dee888 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Coupons/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php index 2004942be30..e0634274693 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php index 67554983ec8..cf6587e8135 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Orders/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php index 24b74ffadd0..53b84f40923 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Customer/Totals/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php index abe52bfa30a..a811c06f2a0 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Entity/Summary/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event.php b/app/code/core/Mage/Reports/Model/Mysql4/Event.php index 70155e6ee5d..991f5c52398 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php index 64d0cb4e9b9..d0cf78b6585 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php index 73b59e17e93..01b70015784 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php index 1f79b7a86ae..e8fe0a5bee5 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Event/Type/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php index fca6b4ba981..b1ef26c9b37 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Invoiced/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php index f54ccfe3c47..8c646a2e58f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php index 871fcebfd53..677fe064287 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php index 6db2c43624a..a1269e8032d 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Downloads/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php index e71d7ecb77f..020539db547 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php index f192599c3e1..4c7eeb48378 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php index d4a474ff5b2..55170c89f0f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php index a194cc5a7fc..d97ace22084 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Compared/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed.php index 0433e11f0e5..31ca88fad65 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Product/Index/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php index 687b0eb8f5d..09b9990eb37 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Index/Viewed/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php index 9941e0ca8fa..5c6e1b30ed1 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Lowstock/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php index 4d18162d25c..8c8cdd694d1 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Ordered/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php index e80e70d3541..7592428b032 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Sold/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php index 74022a945d5..d3234a1f1fc 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Product/Viewed/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php index 21b1c69cf0d..04d869e2f3b 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Quote/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php index 9ab84447f2a..104c10cd2e4 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Refunded/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php index 6f302ad5d3f..a6f90b4d86f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Report/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php index dffd6fe0e31..c8e449f0f68 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Report/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php index 436fb7d4cc6..8af84112689 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php index 1ab914a8278..698827c474e 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php index c4960a0dc71..ad6deccee16 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Review/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php index dd8c546fd8c..49477b6e764 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Shipping/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php index d87a48c6283..f39958a4dd2 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Shopcart/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php index 0cac45c0d3b..40459f0367e 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php index 43019c1512e..27ee11eb3e9 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php index 9812bee2aa5..c3d73dab93f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tag/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php index 7dca4643bfb..05af443be3f 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Tax/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php index f35f089bbe0..a2ca0f09e09 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php index 186fb713fb6..a640eece656 100644 --- a/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Mysql4/Wishlist/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php index 9aa22506a82..7e9674f3ed0 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Product/Index/Compared.php b/app/code/core/Mage/Reports/Model/Product/Index/Compared.php index 0e3a5d5cebc..b9d95a43ea0 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Compared.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Compared.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,10 +45,6 @@ class Mage_Reports_Model_Product_Index_Compared extends Mage_Reports_Model_Produ */ protected $_countCacheKey = 'product_index_compared_count'; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('reports/product_index_compared'); 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..ca2f0a9b10b 100644 --- a/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php +++ b/app/code/core/Mage/Reports/Model/Product/Index/Viewed.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +35,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/Report.php b/app/code/core/Mage/Reports/Model/Report.php index 5c61e8ed6f1..747f0564332 100644 --- a/app/code/core/Mage/Reports/Model/Report.php +++ b/app/code/core/Mage/Reports/Model/Report.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Reports_Model_Report * + * @category Mage + * @package Mage_Reports + * @author Magento Core Team + * * @method int getPageSize() * @method $this setPageSize(int $value) * @method array getStoreIds() diff --git a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php index d1987b9b4d6..4ce9e9e3ab8 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Accounts/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php index 8cc5d7b56eb..5faa137eb4d 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Coupons/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -124,7 +125,7 @@ public function joinFields($from, $to, $storeIds = []) /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php index 11e95a93a78..32b8c2a9a4e 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,14 +31,14 @@ class Mage_Reports_Model_Resource_Customer_Collection extends Mage_Customer_Mode /** * Add order statistics flag * - * @var boolean + * @var bool */ protected $_addOrderStatistics = false; /** * Add order statistics is filter flag * - * @var boolean + * @var bool */ protected $_addOrderStatisticsIsFilter = false; @@ -266,7 +267,7 @@ public function orderByCustomerRegistration($dir = self::SORT_ORDER_DESC) /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php index a398b01ed4e..516ddeda647 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Orders/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php index 8ca5d499c7f..55300ffdf24 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Customer/Totals/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php index 305f593a824..7984df73fa8 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Entity/Summary/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php index 5dd5e2633da..baff6379a98 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -114,8 +115,9 @@ public function applyLogToCollection( /** * Obtain all current store ids, depending on configuration * - * @param array $predefinedStoreIds + * @param array|null $predefinedStoreIds * @return array + * @throws Mage_Core_Model_Store_Exception */ public function getCurrentStoreIds(array $predefinedStoreIds = null) { diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php index e27413cc78e..35ba6d93a2b 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -45,10 +46,6 @@ class Mage_Reports_Model_Resource_Event_Collection extends Mage_Core_Model_Resou */ protected $_useAnalyticFunction = true; - /** - * Resource initializations - * - */ protected function _construct() { $this->_init('reports/event'); 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..6e6bd1a120b 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Type.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php index 96c3b7a7b8f..e71e3ea91f7 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Reports_Model_Resource_Event_Type_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('reports/event_type'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php index a5b045b4ff2..ed9de527036 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php +++ b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Reports resource helper interface + * + * @category Mage + * @package Mage_Reports + * @author Magento Core Team */ interface Mage_Reports_Model_Resource_Helper_Interface { diff --git a/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php index c29f1d33d7a..c7e183ad558 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php @@ -7,27 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Reports Mysql resource helper model * - * @category Mage - * @package Mage_Reports - * @author Magento Core Team + * @category Mage + * @package Mage_Reports + * @author Magento Core Team */ class Mage_Reports_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Mysql4 implements Mage_Reports_Model_Resource_Helper_Interface { - /** * Merge Index data * diff --git a/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php index 256d2711272..6b9fd8dbf04 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Invoiced/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,7 +112,7 @@ public function setStoreIds($storeIds) /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php index 43a57e7bc04..a0c33013bf2 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,7 +33,7 @@ class Mage_Reports_Model_Resource_Order_Collection extends Mage_Sales_Model_Reso /** * Is live * - * @var boolean + * @var bool */ protected $_isLive = false; @@ -58,7 +59,7 @@ public function checkIsLive($range) /** * Retrieve is live flag for rep * - * @return boolean + * @return bool */ public function isLive() { @@ -314,7 +315,7 @@ protected function _getTZRangeExpressionForAttribute($range, $attribute, $tzFrom * @param string $range * @param string $customStart * @param string $customEnd - * @param boolean $returnObjects + * @param bool $returnObjects * @return array */ public function getDateRange($range, $customStart, $customEnd, $returnObjects = false) @@ -668,7 +669,7 @@ public function addOrdersCount() /** * Add revenue * - * @param boolean $convertCurrency + * @param bool $convertCurrency * @return $this */ public function addRevenueToSelect($convertCurrency = false) diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php index fa93a751914..04e7e34bc72 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php index b64db1fb6ba..01dc9dcb4d1 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Downloads/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php index 5c62c64fb02..d5aeefb7fe4 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php index fd1cd5d9853..2a0713a04c3 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..5823a51102d 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Compared/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php index 3dd91e83497..b6533739e94 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Compared/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..af4d92b3b5b 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Product/Index/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php index 500f5725d08..4c307170a50 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Viewed/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php index 4cd6e0cf0da..b1fa0f21d7d 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php index a84e415a91d..16fc021f583 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Ordered/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php index 6be85bb560f..ce6c775e983 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php index 38a4778d485..7538fddcedf 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Product/Viewed/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php index 5bd4d102422..81cd94c4c02 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php index b7c49bb4fca..3fdcf5ff580 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Refunded/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -98,7 +99,7 @@ public function setStoreIds($storeIds) /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php index 1f8ff46b287..58758507951 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +92,7 @@ protected function _getFlagData($code) } /** - * Trancate table + * Truncate table * * @param string $table * @return Mage_Reports_Model_Resource_Report_Abstract diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php index 284e03a3936..205091cffcd 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -76,10 +77,6 @@ class Mage_Reports_Model_Resource_Report_Collection */ protected $_storeIds; - /** - * Resource initialization - * - */ protected function _construct() { } @@ -114,7 +111,7 @@ public function setInterval($from, $to) /** * Get intervals * - * @return array|int + * @return array * @throws Zend_Date_Exception */ public function getIntervals() diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php index 178380f58d5..636a9b0a3ec 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -207,7 +208,7 @@ protected function _applyStoresFilter() /** * Set apply filters flag * - * @param boolean $flag + * @param bool $flag * @return $this */ public function setApplyFilters($flag) @@ -219,7 +220,7 @@ public function setApplyFilters($flag) /** * Getter/Setter for isTotals * - * @param null|boolean $flag + * @param null|bool $flag * @return $this|bool */ public function isTotals($flag = null) @@ -234,7 +235,7 @@ public function isTotals($flag = null) /** * Getter/Setter for isSubTotals * - * @param null|boolean $flag + * @param null|bool $flag * @return $this|bool */ public function isSubTotals($flag = null) 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..7ee82616957 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +32,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/Resource/Report/Product/Viewed/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php index 573b3194e65..aa27d113bc3 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php index 0fb2dfc5349..1c87d6a04d0 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,18 +28,12 @@ */ class Mage_Reports_Model_Resource_Review_Collection extends Mage_Review_Model_Resource_Review_Collection { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('review/review'); } /** - * add product filter - * * @param string|int $productId * @return $this */ @@ -64,7 +59,7 @@ public function resetSelect() /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php index 9e2dbf5b76a..e34b3bb63fa 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -121,7 +122,7 @@ public function joinCustomers() /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php index f3c5824bfac..d7b1764db63 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Review/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php index 80f45f0e9b0..12c0941907e 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Shipping/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php index 39d180d98eb..5bb7a589a9d 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Shopcart/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php index 26634d6cf05..5983148fd6d 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php index 5d1e3c2aec1..04c653d1484 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +48,7 @@ public function addTagedCount() /** * get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php index 95475967f31..4cc0c76dbfe 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tag/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php index 7b10e808b50..8f60427925b 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Tax/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +92,7 @@ public function setStoreIds($storeIds) /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php index 42780ee1ca4..693052850ed 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,10 +35,6 @@ class Mage_Reports_Model_Resource_Wishlist_Collection extends Mage_Core_Model_Re */ protected $_wishlistTable; - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('wishlist/wishlist'); diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php index 88f157b92c5..cb9bb34b167 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php +++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,18 +28,12 @@ */ class Mage_Reports_Model_Resource_Wishlist_Product_Collection extends Mage_Wishlist_Model_Resource_Product_Collection { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('wishlist/wishlist'); } /** - * Add wishlist count - * * @return $this */ public function addWishlistCount() @@ -85,7 +80,7 @@ public function getCustomerCount() /** * Get select count sql * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Reports/Model/Session.php b/app/code/core/Mage/Reports/Model/Session.php index 920f0625156..fb4f38f4664 100644 --- a/app/code/core/Mage/Reports/Model/Session.php +++ b/app/code/core/Mage/Reports/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..ea0e6e76cd0 100644 --- a/app/code/core/Mage/Reports/Model/Test.php +++ b/app/code/core/Mage/Reports/Model/Test.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +24,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..a5959ee3ab5 100644 --- a/app/code/core/Mage/Reports/Model/Totals.php +++ b/app/code/core/Mage/Reports/Model/Totals.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Reports_Model_Totals { @@ -55,7 +56,7 @@ public function countTotals($grid, $from, $to) foreach ($columns as $field => $a) { if ($field !== '') { - $columns[$field]['value'] = $columns[$field]['value'] + (isset($data[$field]) ? $data[$field] : 0); + $columns[$field]['value'] += $data[$field] ?? 0; } } $count++; diff --git a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php index 84c1ffcfc81..38645fbe94f 100644 --- a/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/data/reports_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/etc/adminhtml.xml b/app/code/core/Mage/Reports/etc/adminhtml.xml index 0b24638b11f..605e9cdf46e 100644 --- a/app/code/core/Mage/Reports/etc/adminhtml.xml +++ b/app/code/core/Mage/Reports/etc/adminhtml.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. (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/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml index 2948c91c6da..f5410009e42 100644 --- a/app/code/core/Mage/Reports/etc/config.xml +++ b/app/code/core/Mage/Reports/etc/config.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. (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/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml index f0d65824ac1..6ccb8cfdc92 100644 --- a/app/code/core/Mage/Reports/etc/system.xml +++ b/app/code/core/Mage/Reports/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..e4a8afc0f78 100644 --- a/app/code/core/Mage/Reports/etc/widget.xml +++ b/app/code/core/Mage/Reports/etc/widget.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. (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/install-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php index 07230fff8a3..8d403a816b0 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php index d2b158ef155..2c8c056c244 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-0.7.1.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Report events SQL - * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php index 9e9d6a53828..58973ee2514 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.5.0.0.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ $installer = $this; -$installFile = dirname(__FILE__) . DS . 'install-1.6.0.0.php'; +$installFile = __DIR__ . DS . 'install-1.6.0.0.php'; if (file_exists($installFile)) { include $installFile; diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php index ae1541466f7..e424a8219f3 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-install-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ @@ -177,7 +178,7 @@ ->setComment('Reports Viewed Product Index Table'); $installer->getConnection()->createTable($table); -$installFile = dirname(__FILE__) . DS . 'install-1.6.0.0.php'; +$installFile = __DIR__ . DS . 'install-1.6.0.0.php'; if (file_exists($installFile)) { include $installFile; } diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php index fd39f6262c9..0c3695dc2c7 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Report events SQL - * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php index 368ae862cee..80c242434ee 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Report events SQL - * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php index c2a2437c061..47e91a6c8d0 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +24,11 @@ * * @category Mage * @package Mage_Reports - * @author Magento Core Team + * @author Magento Core Team */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php index 56adf670e19..1ad4a82bdb5 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,29 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$this->getTable('report_event')} DROP INDEX `event_type_id`, diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php index cb685de1118..792015f3ed2 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,28 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" @@ -41,4 +32,5 @@ right.reports.product.compared -->') WHERE `identifier`='home'; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php index b8475478f0b..facd36ddb89 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.5-0.7.7.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * #7828 bugfix - * * @category Mage - * @package Mage_Rating - * @author Magento Core Team + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $oldLayout = $installer->getConnection()->fetchOne("SELECT layout_update_xml FROM {$installer->getTable('cms_page')} WHERE `identifier`='home' LIMIT 1"); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php index 38c66ef48a9..0ba831ce1a7 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" CREATE TABLE `{$installer->getTable('reports/viewed_product_index')}` ( @@ -61,4 +62,5 @@ ) ENGINE=InnoDB DEFAULT CHARSET=utf8; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php index be33fdf5d49..f84b9d50fc4 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run("ALTER TABLE {$this->getTable('report_viewed_product_index')} CHANGE `visitor_id` `visitor_id` INT( 10 ) UNSIGNED NULL "); $installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php index feb5ad06077..6cd21c11698 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,24 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->modifyColumn( $installer->getTable('reports/compared_product_index'), 'visitor_id', 'INT(10) UNSIGNED NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 296dfef1b73..205bfde5646 100644 --- a/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Reports/sql/reports_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/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..a78c7dfff02 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 @@ -7,22 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Reports + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/List.php b/app/code/core/Mage/Review/Block/Customer/List.php index d124deee5ef..d92fd7428f9 100644 --- a/app/code/core/Mage/Review/Block/Customer/List.php +++ b/app/code/core/Mage/Review/Block/Customer/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Review_Block_Customer_List extends Mage_Customer_Block_Account_Dashboard { diff --git a/app/code/core/Mage/Review/Block/Customer/Recent.php b/app/code/core/Mage/Review/Block/Customer/Recent.php index a75b6a2abe7..b369d54b20d 100644 --- a/app/code/core/Mage/Review/Block/Customer/Recent.php +++ b/app/code/core/Mage/Review/Block/Customer/Recent.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team * * @property Mage_Review_Model_Resource_Review_Product_Collection $_collection */ diff --git a/app/code/core/Mage/Review/Block/Customer/View.php b/app/code/core/Mage/Review/Block/Customer/View.php index f9091beb7b0..7da1a20fc92 100644 --- a/app/code/core/Mage/Review/Block/Customer/View.php +++ b/app/code/core/Mage/Review/Block/Customer/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team * * @method string getReviewId() * @method $this setReviewId(string $value) @@ -137,7 +138,7 @@ public function dateFormat($date) /** * Check whether current customer is review owner * - * @return boolean + * @return bool */ public function isReviewOwner() { diff --git a/app/code/core/Mage/Review/Block/Form.php b/app/code/core/Mage/Review/Block/Form.php index 2a40fb9583e..96b2a5ca3bf 100644 --- a/app/code/core/Mage/Review/Block/Form.php +++ b/app/code/core/Mage/Review/Block/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Helper.php b/app/code/core/Mage/Review/Block/Helper.php index 2dea7aea2a5..dd68f9d9dd0 100644 --- a/app/code/core/Mage/Review/Block/Helper.php +++ b/app/code/core/Mage/Review/Block/Helper.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php index 6bf333a80ac..7e98b56cf3b 100644 --- a/app/code/core/Mage/Review/Block/Product/View.php +++ b/app/code/core/Mage/Review/Block/Product/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Block/Product/View/List.php b/app/code/core/Mage/Review/Block/Product/View/List.php index d74712ac8f1..a955ae2230e 100644 --- a/app/code/core/Mage/Review/Block/Product/View/List.php +++ b/app/code/core/Mage/Review/Block/Product/View/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Review_Block_Product_View_List extends Mage_Review_Block_Product_View { diff --git a/app/code/core/Mage/Review/Block/View.php b/app/code/core/Mage/Review/Block/View.php index 9aff1bbbcf3..02ba208de57 100644 --- a/app/code/core/Mage/Review/Block/View.php +++ b/app/code/core/Mage/Review/Block/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..fb81c5e117e 100644 --- a/app/code/core/Mage/Review/Helper/Data.php +++ b/app/code/core/Mage/Review/Helper/Data.php @@ -7,28 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default review helper * - * @category Mage - * @package Mage_Review - * @author Magento Core Team + * @category Mage + * @package Mage_Review + * @author Magento Core Team */ class Mage_Review_Helper_Data extends Mage_Core_Helper_Abstract { const XML_REVIEW_GUETS_ALLOW = 'catalog/review/allow_guest'; + protected $_moduleName = 'Mage_Review'; + /** * @param string $origDetail * @return string diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review.php b/app/code/core/Mage/Review/Model/Mysql4/Review.php index 0f3d78da875..789f8560cba 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Review 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 extends Mage_Review_Model_Resource_Review diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php index 8a8182ec834..a819d71b704 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php index a586627e813..d47ae31168e 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php index 48bd0686a4a..c13323e4615 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Status/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..bd74f868792 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php index 41619c6699a..e102ce4db12 100644 --- a/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php +++ b/app/code/core/Mage/Review/Model/Mysql4/Review/Summary/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Observer.php b/app/code/core/Mage/Review/Model/Observer.php index 0d6e8a025ed..4c85bd240f3 100644 --- a/app/code/core/Mage/Review/Model/Observer.php +++ b/app/code/core/Mage/Review/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php index 19d405c133b..2fc6c2534b9 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review.php +++ b/app/code/core/Mage/Review/Model/Resource/Review.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Review 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 extends Mage_Core_Model_Resource_Db_Abstract { @@ -78,7 +79,6 @@ class Mage_Review_Model_Resource_Review extends Mage_Core_Model_Resource_Db_Abst /** * Define main table. Define other tables name - * */ protected function _construct() { @@ -357,7 +357,7 @@ public function aggregate($object) $writeAdapter->beginTransaction(); try { - if ($oldData['primary_id'] > 0) { + if (isset($oldData['primary_id']) && $oldData['primary_id'] > 0) { $condition = ["{$this->_aggregateTable}.primary_id = ?" => $oldData['primary_id']]; $writeAdapter->update($this->_aggregateTable, $data->getData(), $condition); } else { diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php index d3b3577c1d7..cacbf6d5282 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -192,7 +193,7 @@ public function addStatusFilter($status) { if (is_string($status)) { $statuses = array_flip(Mage::helper('review')->getReviewStatuses()); - $status = isset($statuses[$status]) ? $statuses[$status] : 0; + $status = $statuses[$status] ?? 0; } if (is_numeric($status)) { $this->addFilter( @@ -261,8 +262,8 @@ public function addReviewsTotalCount() /** * Load data * - * @param boolean $printQuery - * @param boolean $logQuery + * @param bool $printQuery + * @param bool $logQuery * @return $this */ public function load($printQuery = false, $logQuery = false) diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php index 877fa5763fd..1135e2977e7 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,7 +45,7 @@ class Mage_Review_Model_Resource_Review_Product_Collection extends Mage_Catalog_ /** * Add store data flag * - * @var boolean + * @var bool */ protected $_addStoreDataFlag = false; @@ -311,7 +312,7 @@ public function getAllIds($limit = null, $offset = null) /** * Render SQL for retrieve product count * - * @return string + * @return Varien_Db_Select|null */ public function getSelectCountSql() { 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..6fbfe7c115e 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Status.php @@ -7,31 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Status/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php index d20ba729123..d78e491f5a8 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..2daff8bd3d8 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Resource/Review/Summary/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php index c8160d92dcd..f8fcd4e089e 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Summary/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/Model/Review.php b/app/code/core/Mage/Review/Model/Review.php index fabbe0242aa..ac90d349f94 100644 --- a/app/code/core/Mage/Review/Model/Review.php +++ b/app/code/core/Mage/Review/Model/Review.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Review model * + * @category Mage + * @package Mage_Review + * @author Magento Core Team + * * @method Mage_Review_Model_Resource_Review _getResource() * @method Mage_Review_Model_Resource_Review getResource() * @method Mage_Review_Model_Resource_Review_Collection getCollection() @@ -43,10 +48,6 @@ * @method array getStores() * @method $this setStores(array $value) * @method string getTitle() - * - * @category Mage - * @package Mage_Review - * @author Magento Core Team */ class Mage_Review_Model_Review extends Mage_Core_Model_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..ad5319174ad 100644 --- a/app/code/core/Mage/Review/Model/Review/Status.php +++ b/app/code/core/Mage/Review/Model/Review/Status.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..836fc51a999 100644 --- a/app/code/core/Mage/Review/Model/Review/Summary.php +++ b/app/code/core/Mage/Review/Model/Review/Summary.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,13 +24,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..3caacf677b5 100644 --- a/app/code/core/Mage/Review/Model/Session.php +++ b/app/code/core/Mage/Review/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/controllers/CustomerController.php b/app/code/core/Mage/Review/controllers/CustomerController.php index 86152779206..db1522ca12b 100644 --- a/app/code/core/Mage/Review/controllers/CustomerController.php +++ b/app/code/core/Mage/Review/controllers/CustomerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,6 +39,7 @@ public function preDispatch() if (!Mage::getSingleton('customer/session')->authenticate($this)) { $this->setFlag('', self::FLAG_NO_DISPATCH, true); } + return $this; } /** diff --git a/app/code/core/Mage/Review/controllers/ProductController.php b/app/code/core/Mage/Review/controllers/ProductController.php index ac77570a46e..ad1c77ce7ca 100644 --- a/app/code/core/Mage/Review/controllers/ProductController.php +++ b/app/code/core/Mage/Review/controllers/ProductController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Review_ProductController extends Mage_Core_Controller_Front_Action { - /** * Action list where need check enabled cookie * diff --git a/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php index e2513681ef9..22e113cb062 100644 --- a/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Review/data/review_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Review/etc/adminhtml.xml b/app/code/core/Mage/Review/etc/adminhtml.xml index 87e67e3d60e..47f91b6eddc 100644 --- a/app/code/core/Mage/Review/etc/adminhtml.xml +++ b/app/code/core/Mage/Review/etc/adminhtml.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. (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/Review/etc/config.xml b/app/code/core/Mage/Review/etc/config.xml index 9057d6e5e76..8ffbcafa09b 100644 --- a/app/code/core/Mage/Review/etc/config.xml +++ b/app/code/core/Mage/Review/etc/config.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. (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/Review/etc/system.xml b/app/code/core/Mage/Review/etc/system.xml index e2cca1c4b14..9f0e4dd24a5 100644 --- a/app/code/core/Mage/Review/etc/system.xml +++ b/app/code/core/Mage/Review/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php b/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php index 548f8433d6e..597b656cfe8 100644 --- a/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/install-1.6.0.0.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -/** - * Review install - * - * @category Mage - * @package Mage_Review - * @author Magento Core Team - */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + /** * Create table 'review/review_entity' */ diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php index cf4f609688b..bfb0a45e518 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php index a1b0db3df16..ab33ba9f2f8 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Review - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php index db3aca97ffb..1662edee6a9 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php index b4730a48ae0..9688ba133f7 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php index bef0697a0e3..590b64e783b 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addConstraint( 'FK_REVIEW_STORE_REVIEW', $installer->getTable('review/review_store'), @@ -32,4 +33,5 @@ 'CASCADE', true ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php index 36d4acf2c26..77ef2809f6d 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $tableReviewDetail = $installer->getTable('review/review_detail'); diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php index ebf0ab1aedb..311068ce6f9 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->dropForeignKey($this->getTable('review'), 'FK_REVIEW_PARENT_PRODUCT'); $installer->endSetup(); diff --git a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 0d1ddca12bb..2f999d41cfe 100644 --- a/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Review/sql/review_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Review + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Rss/Block/Abstract.php b/app/code/core/Mage/Rss/Block/Abstract.php index cf69d55062b..ca69140326c 100644 --- a/app/code/core/Mage/Rss/Block/Abstract.php +++ b/app/code/core/Mage/Rss/Block/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Abstract.php b/app/code/core/Mage/Rss/Block/Catalog/Abstract.php index 44185c61205..2abc9fc1e29 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Abstract.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/Category.php b/app/code/core/Mage/Rss/Block/Catalog/Category.php index bf029f03bdb..360656d3c88 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Category.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Catalog/New.php b/app/code/core/Mage/Rss/Block/Catalog/New.php index 5fad892569a..51ca4115a41 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/New.php +++ b/app/code/core/Mage/Rss/Block/Catalog/New.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Catalog_New extends Mage_Rss_Block_Catalog_Abstract { diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php index e234d754794..62e72b1c47e 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php +++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Rss_Block_Catalog_NotifyStock extends Mage_Rss_Block_Abstract { - /** * Cache tag constant for feed notify stock * @@ -35,9 +35,6 @@ class Mage_Rss_Block_Catalog_NotifyStock extends Mage_Rss_Block_Abstract */ const CACHE_TAG = 'block_html_rss_catalog_notifystock'; - /** - * Constructor - */ protected function _construct() { $this->setCacheTags([self::CACHE_TAG]); diff --git a/app/code/core/Mage/Rss/Block/Catalog/Review.php b/app/code/core/Mage/Rss/Block/Catalog/Review.php index 7e18467ec4d..90bbee92dfa 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Review.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Review.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Rss_Block_Catalog_Review extends Mage_Rss_Block_Abstract { - /** * Cache tag constant for feed reviews * diff --git a/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php b/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php index 1171bb327d5..0620b312dbc 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Salesrule.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_Catalog_Salesrule extends Mage_Rss_Block_Abstract { diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php index 2d9065020a8..8e21c1216de 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Special.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Special.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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 { @@ -195,9 +196,9 @@ public function addSpecialXmlCallback($args) /** * Function for comparing two items in collection * - * @param Varien_Object $a - * @param Varien_Object $b - * @return boolean + * @param Varien_Object $a + * @param Varien_Object $b + * @return int */ public function sortByStartDate($a, $b) { diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php index 5f4ef4d0a3b..0a821ca26de 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/List.php b/app/code/core/Mage/Rss/Block/List.php index 196e85280a7..0bbfb75e999 100644 --- a/app/code/core/Mage/Rss/Block/List.php +++ b/app/code/core/Mage/Rss/Block/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Block_List extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Rss/Block/Order/Details.php b/app/code/core/Mage/Rss/Block/Order/Details.php index e31bbf16b9b..4b583f30937 100644 --- a/app/code/core/Mage/Rss/Block/Order/Details.php +++ b/app/code/core/Mage/Rss/Block/Order/Details.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/Block/Order/New.php b/app/code/core/Mage/Rss/Block/Order/New.php index e4f934987bf..d6be089e2a9 100644 --- a/app/code/core/Mage/Rss/Block/Order/New.php +++ b/app/code/core/Mage/Rss/Block/Order/New.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,6 @@ */ class Mage_Rss_Block_Order_New extends Mage_Core_Block_Template { - /** * Cache tag constant for feed new orders * diff --git a/app/code/core/Mage/Rss/Block/Order/Status.php b/app/code/core/Mage/Rss/Block/Order/Status.php index 842171a48f6..2faa88eadcc 100644 --- a/app/code/core/Mage/Rss/Block/Order/Status.php +++ b/app/code/core/Mage/Rss/Block/Order/Status.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..22637f08114 100644 --- a/app/code/core/Mage/Rss/Block/Wishlist.php +++ b/app/code/core/Mage/Rss/Block/Wishlist.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rss/Controller/Abstract.php b/app/code/core/Mage/Rss/Controller/Abstract.php index a290f08f274..1df200ef9fa 100644 --- a/app/code/core/Mage/Rss/Controller/Abstract.php +++ b/app/code/core/Mage/Rss/Controller/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Rss_Controller_Abstract extends Mage_Core_Controller_Front_Action * Check feed enabled in config * * @param string $code - * @return boolean + * @return bool */ protected function isFeedEnable($code) { @@ -44,7 +45,7 @@ protected function isFeedEnable($code) * Do check feed enabled and prepare response * * @param string $code - * @return boolean + * @return bool */ protected function checkFeedEnable($code) { diff --git a/app/code/core/Mage/Rss/Helper/Catalog.php b/app/code/core/Mage/Rss/Helper/Catalog.php index 294a54edadf..55654722672 100644 --- a/app/code/core/Mage/Rss/Helper/Catalog.php +++ b/app/code/core/Mage/Rss/Helper/Catalog.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Rss_Helper_Catalog extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Rss'; + /** * @return string */ diff --git a/app/code/core/Mage/Rss/Helper/Data.php b/app/code/core/Mage/Rss/Helper/Data.php index d8a076218e1..ff37ea4a429 100644 --- a/app/code/core/Mage/Rss/Helper/Data.php +++ b/app/code/core/Mage/Rss/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -32,15 +33,16 @@ class Mage_Rss_Helper_Data extends Mage_Core_Helper_Abstract */ const XML_PATH_RSS_ACTIVE = 'rss/config/active'; + protected $_moduleName = 'Mage_Rss'; + protected $_rssSession; protected $_adminSession; public function __construct(array $params = []) { - $this->_rssSession = isset($params['rss_session']) ? $params['rss_session'] : Mage::getSingleton('rss/session'); - $this->_adminSession = isset($params['admin_session']) - ? $params['admin_session'] : Mage::getSingleton('admin/session'); + $this->_rssSession = $params['rss_session'] ?? Mage::getSingleton('rss/session'); + $this->_adminSession = $params['admin_session'] ?? Mage::getSingleton('admin/session'); } /** diff --git a/app/code/core/Mage/Rss/Helper/Order.php b/app/code/core/Mage/Rss/Helper/Order.php index b3d4b75beef..36f2f7ce2bc 100644 --- a/app/code/core/Mage/Rss/Helper/Order.php +++ b/app/code/core/Mage/Rss/Helper/Order.php @@ -7,24 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Default rss helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Rss + * @author Magento Core Team */ class Mage_Rss_Helper_Order extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Rss'; + /** * Check whether status notification is allowed * diff --git a/app/code/core/Mage/Rss/Model/Mysql4/Order.php b/app/code/core/Mage/Rss/Model/Mysql4/Order.php index 881ab3322a8..c597890ed41 100644 --- a/app/code/core/Mage/Rss/Model/Mysql4/Order.php +++ b/app/code/core/Mage/Rss/Model/Mysql4/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order Rss Resource Model * - * @category Mage - * @package Mage_Rss - * @author Magento Core Team + * @category Mage + * @package Mage_Rss + * @author Magento Core Team * @deprecated */ class Mage_Rss_Model_Mysql4_Order extends Mage_Rss_Model_Resource_Order diff --git a/app/code/core/Mage/Rss/Model/Observer.php b/app/code/core/Mage/Rss/Model/Observer.php index ffcf02434fc..dcf9dd11896 100644 --- a/app/code/core/Mage/Rss/Model/Observer.php +++ b/app/code/core/Mage/Rss/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Rss/Model/Resource/Order.php b/app/code/core/Mage/Rss/Model/Resource/Order.php index 72874a034eb..1f247cff43e 100644 --- a/app/code/core/Mage/Rss/Model/Resource/Order.php +++ b/app/code/core/Mage/Rss/Model/Resource/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order Rss Resource Model * - * @category Mage - * @package Mage_Rss - * @author Magento Core Team + * @category Mage + * @package Mage_Rss + * @author Magento Core Team */ class Mage_Rss_Model_Resource_Order { diff --git a/app/code/core/Mage/Rss/Model/Rss.php b/app/code/core/Mage/Rss/Model/Rss.php index 38a8fec9cfd..cde156d03ac 100644 --- a/app/code/core/Mage/Rss/Model/Rss.php +++ b/app/code/core/Mage/Rss/Model/Rss.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Rss_Model_Rss { diff --git a/app/code/core/Mage/Rss/Model/Session.php b/app/code/core/Mage/Rss/Model/Session.php index 09e95d30133..84b4e8167ad 100644 --- a/app/code/core/Mage/Rss/Model/Session.php +++ b/app/code/core/Mage/Rss/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,10 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Admin_Model_User getAdmin() + * @method $this setAdmin(Mage_Admin_Model_User $value) * @method Mage_Customer_Model_Customer getCustomer() */ class Mage_Rss_Model_Session extends Mage_Core_Model_Session_Abstract diff --git a/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php b/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php index 0e709cd13b8..3061072fd36 100644 --- a/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php +++ b/app/code/core/Mage/Rss/Model/System/Config/Backend/Links.php @@ -7,26 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Cache cleaner backend model * + * @category Mage + * @package Mage_Rss + * @author Magento Core Team */ class Mage_Rss_Model_System_Config_Backend_Links extends Mage_Core_Model_Config_Data { /** * Invalidate cache type, when value was changed - * */ protected function _afterSave() { diff --git a/app/code/core/Mage/Rss/controllers/CatalogController.php b/app/code/core/Mage/Rss/controllers/CatalogController.php index f6241102db4..b2d8ee3cf73 100644 --- a/app/code/core/Mage/Rss/controllers/CatalogController.php +++ b/app/code/core/Mage/Rss/controllers/CatalogController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/controllers/IndexController.php b/app/code/core/Mage/Rss/controllers/IndexController.php index 217e687ce30..a52d33a032c 100644 --- a/app/code/core/Mage/Rss/controllers/IndexController.php +++ b/app/code/core/Mage/Rss/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -73,7 +74,7 @@ public function nofeedAction() * Wishlist rss feed action * Show all public wishlists and private wishlists that belong to current user * - * @return mixed + * @return void */ public function wishlistAction() { diff --git a/app/code/core/Mage/Rss/controllers/OrderController.php b/app/code/core/Mage/Rss/controllers/OrderController.php index 3804f798a5a..4b8c744ffcc 100644 --- a/app/code/core/Mage/Rss/controllers/OrderController.php +++ b/app/code/core/Mage/Rss/controllers/OrderController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Rss + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Rss - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Rss_OrderController extends Mage_Rss_Controller_Abstract { public function newAction() diff --git a/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php index 307f1bd4b76..ed0c72f8fb5 100644 --- a/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Rss/data/rss_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rss/etc/adminhtml.xml b/app/code/core/Mage/Rss/etc/adminhtml.xml index 245eff5c617..6f1cc4289ba 100644 --- a/app/code/core/Mage/Rss/etc/adminhtml.xml +++ b/app/code/core/Mage/Rss/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 58345a22578..dfda573cbce 100644 --- a/app/code/core/Mage/Rss/etc/config.xml +++ b/app/code/core/Mage/Rss/etc/config.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. (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/Rss/etc/system.xml b/app/code/core/Mage/Rss/etc/system.xml index 21c3c2082c2..3f860b93cb4 100644 --- a/app/code/core/Mage/Rss/etc/system.xml +++ b/app/code/core/Mage/Rss/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Rule/Block/Actions.php b/app/code/core/Mage/Rule/Block/Actions.php index 380d915c84d..1b643d9b687 100644 --- a/app/code/core/Mage/Rule/Block/Actions.php +++ b/app/code/core/Mage/Rule/Block/Actions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Conditions.php b/app/code/core/Mage/Rule/Block/Conditions.php index 8b2b13d2e75..794245f876c 100644 --- a/app/code/core/Mage/Rule/Block/Conditions.php +++ b/app/code/core/Mage/Rule/Block/Conditions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Editable.php b/app/code/core/Mage/Rule/Block/Editable.php index eaea690541f..10bbc6ca6c1 100644 --- a/app/code/core/Mage/Rule/Block/Editable.php +++ b/app/code/core/Mage/Rule/Block/Editable.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Block/Newchild.php b/app/code/core/Mage/Rule/Block/Newchild.php index 7e002919cff..862d15a1dc1 100644 --- a/app/code/core/Mage/Rule/Block/Newchild.php +++ b/app/code/core/Mage/Rule/Block/Newchild.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Rule + * @author Magento Core Team + */ class Mage_Rule_Block_Newchild extends Mage_Core_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface { /** diff --git a/app/code/core/Mage/Rule/Block/Rule.php b/app/code/core/Mage/Rule/Block/Rule.php index 2eb94394cc5..67c95b2d30e 100644 --- a/app/code/core/Mage/Rule/Block/Rule.php +++ b/app/code/core/Mage/Rule/Block/Rule.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Rule + * @author Magento Core Team + */ class Mage_Rule_Block_Rule extends Mage_Core_Block_Abstract { - } diff --git a/app/code/core/Mage/Rule/Helper/Data.php b/app/code/core/Mage/Rule/Helper/Data.php index 14f623c0311..1cca4eb47f7 100644 --- a/app/code/core/Mage/Rule/Helper/Data.php +++ b/app/code/core/Mage/Rule/Helper/Data.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Rule'; } diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php index 6a69f58b91a..9e5ddea4f9e 100644 --- a/app/code/core/Mage/Rule/Model/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php index a8a0d2d336f..18750ce3be3 100644 --- a/app/code/core/Mage/Rule/Model/Action/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Action/Collection.php b/app/code/core/Mage/Rule/Model/Action/Collection.php index 5b74b9bb341..fe85769b134 100644 --- a/app/code/core/Mage/Rule/Model/Action/Collection.php +++ b/app/code/core/Mage/Rule/Model/Action/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Action/Interface.php b/app/code/core/Mage/Rule/Model/Action/Interface.php index 927f349a235..e9f7ce989a6 100644 --- a/app/code/core/Mage/Rule/Model/Action/Interface.php +++ b/app/code/core/Mage/Rule/Model/Action/Interface.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Rule + * @author Magento Core Team + */ interface Mage_Rule_Model_Action_Interface { - } diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php index 0fdfd23f17c..f6d5352b054 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -200,10 +201,10 @@ public function asXml() public function loadArray($arr) { $this->setType($arr['type']); - $this->setAttribute(isset($arr['attribute']) ? $arr['attribute'] : false); - $this->setOperator(isset($arr['operator']) ? $arr['operator'] : false); - $this->setValue(isset($arr['value']) ? $arr['value'] : false); - $this->setIsValueParsed(isset($arr['is_value_parsed']) ? $arr['is_value_parsed'] : false); + $this->setAttribute($arr['attribute'] ?? false); + $this->setOperator($arr['operator'] ?? false); + $this->setValue($arr['value'] ?? false); + $this->setIsValueParsed($arr['is_value_parsed'] ?? false); return $this; } @@ -271,16 +272,13 @@ public function loadOperatorOptions() /** * This value will define which operators will be available for this condition. * - * Possible values are: string, numeric, date, select, multiselect, grid, boolean + * Possible values are: string, numeric, date, select, multiselect, grid, bool * * @return string */ public function getInputType() { - if ($this->_inputType === null) { - return 'string'; - } - return $this->_inputType; + return $this->_inputType ?? 'string'; } /** @@ -341,7 +339,7 @@ public function getValueParsed() if (!$this->hasValueParsed()) { $value = $this->getData('value'); if ($this->isArrayOperatorType() && is_string($value)) { - $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY); + $value = preg_split('#\s*[,;]\s*#', $value, -1, PREG_SPLIT_NO_EMPTY); } $this->setValueParsed($value); } diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php index 29d12a9517b..0b4a880f041 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Combine.php +++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -255,10 +256,8 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition') */ public function loadArray($arr, $key = 'conditions') { - $this->setAggregator(isset($arr['aggregator']) ? $arr['aggregator'] - : (isset($arr['attribute']) ? $arr['attribute'] : null)) - ->setValue(isset($arr['value']) ? $arr['value'] - : (isset($arr['operator']) ? $arr['operator'] : null)); + $this->setAggregator($arr['aggregator'] ?? $arr['attribute'] ?? null) + ->setValue($arr['value'] ?? $arr['operator'] ?? null); if (!empty($arr[$key]) && is_array($arr[$key])) { foreach ($arr[$key] as $condArr) { diff --git a/app/code/core/Mage/Rule/Model/Condition/Interface.php b/app/code/core/Mage/Rule/Model/Condition/Interface.php index 3343f01cc8e..0e1552569c0 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Interface.php +++ b/app/code/core/Mage/Rule/Model/Condition/Interface.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Rule + * @author Magento Core Team + */ interface Mage_Rule_Model_Condition_Interface { - } diff --git a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php index 83d48e12e3f..a5d903001cc 100644 --- a/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Condition/Product/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -476,7 +477,7 @@ public function getExplicitApply() */ public function loadArray($arr) { - $this->setAttribute(isset($arr['attribute']) ? $arr['attribute'] : false); + $this->setAttribute($arr['attribute'] ?? false); $attribute = $this->getAttributeObject(); $isContainsOperator = !empty($arr['operator']) && in_array($arr['operator'], ['{}', '!{}']); @@ -504,7 +505,7 @@ public function loadArray($arr) } /** - * Validate product attrbute value for condition + * Validate product attribute value for condition * * @param Varien_Object $object * @return bool diff --git a/app/code/core/Mage/Rule/Model/Environment.php b/app/code/core/Mage/Rule/Model/Environment.php index e032fc11653..03fd8919142 100644 --- a/app/code/core/Mage/Rule/Model/Environment.php +++ b/app/code/core/Mage/Rule/Model/Environment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php index 68e07a60c43..a83be77fd35 100644 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/Rule/Model/Mysql4/Rule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote rule mysql4 resource model * - * @category Mage - * @package Mage_Rule - * @author Magento Core Team + * @category Mage + * @package Mage_Rule + * @author Magento Core Team * @deprecated */ class Mage_Rule_Model_Mysql4_Rule extends Mage_Rule_Model_Resource_Rule diff --git a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php index dffb055b440..99b4795757a 100644 --- a/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/Rule/Model/Mysql4/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Renderer/Actions.php b/app/code/core/Mage/Rule/Model/Renderer/Actions.php index f712df69fa6..0a059a26066 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Actions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Actions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php index ee83e619398..a160863da2f 100644 --- a/app/code/core/Mage/Rule/Model/Renderer/Conditions.php +++ b/app/code/core/Mage/Rule/Model/Renderer/Conditions.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Abstract.php index ca9520a9771..49e80eace89 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule.php b/app/code/core/Mage/Rule/Model/Resource/Rule.php index 462a98000a5..886f8921477 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule.php @@ -7,31 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract Rule entity resource model * + * @category Mage + * @package Mage_Rule + * @author Magento Core Team * @deprecated since 1.7.0.0 use Mage_Rule_Model_Resource_Abstract instead - * - * @category Mage - * @package Mage_Rule - * @author Magento Core Team */ class Mage_Rule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abstract { - /** - * Initialize main table and table id field - */ protected function _construct() { $this->_init('rule/rule', 'rule_id'); diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php index ba51ec60a6e..1311fd24fb0 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php index 46bdb129fcf..edfaa20e5cd 100644 --- a/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php +++ b/app/code/core/Mage/Rule/Model/Resource/Rule/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Rule - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -85,7 +86,7 @@ protected function _afterLoad() */ public function addWebsitesToResult($flag = null) { - $flag = ($flag === null) ? true : $flag; + $flag = $flag ?? true; $this->setFlag('add_websites_to_result', $flag); return $this; } @@ -174,10 +175,10 @@ protected function _getAssociatedEntityInfo($entityType) /** * Set environment for all rules in collection * + * @param Mage_Rule_Model_Environment|null $env + * @return $this * @deprecated after 1.6.2.0 * - * @param Mage_Rule_Model_Environment $env - * @return Mage_Rule_Model_Resource_Rule_Collection_Abstract */ public function setEnv(Mage_Rule_Model_Environment $env = null) { 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..06647bb6dd1 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 @@ -7,36 +7,37 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 = []) { - $this->_adapter = isset($config['adapter']) - ? $config['adapter'] - : Mage::getSingleton('core/resource')->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE); + $this->_adapter = $config['adapter'] ?? Mage::getSingleton('core/resource')->getConnection(Mage_Core_Model_Resource::DEFAULT_READ_RESOURCE); } /** diff --git a/app/code/core/Mage/Rule/Model/Rule.php b/app/code/core/Mage/Rule/Model/Rule.php index d9485ff09e1..7852d59f177 100644 --- a/app/code/core/Mage/Rule/Model/Rule.php +++ b/app/code/core/Mage/Rule/Model/Rule.php @@ -7,25 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Rule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Abstract Rule entity data model * + * @category Mage + * @package Mage_Rule + * @author Magento Core Team * @deprecated since 1.7.0.0 use Mage_Rule_Model_Abstract instead - * - * @category Mage - * @package Mage_Rule - * @author Magento Core Team */ class Mage_Rule_Model_Rule extends Mage_Rule_Model_Abstract { diff --git a/app/code/core/Mage/Rule/etc/config.xml b/app/code/core/Mage/Rule/etc/config.xml index f4c8ad014fd..92ef9d54951 100644 --- a/app/code/core/Mage/Rule/etc/config.xml +++ b/app/code/core/Mage/Rule/etc/config.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_Rule - * @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_Rule + * @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/Block/Adminhtml/Billing/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php index efd68e680b9..75ab4b4fb37 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php index 7645c7f9696..785661d9247 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -139,7 +140,6 @@ protected function _prepareColumns() $this->addColumn('created_at', [ 'header' => Mage::helper('sales')->__('Created At'), 'index' => 'agreement_created_at', - 'width' => 1, 'type' => 'datetime', 'align' => 'center', 'default' => $this->__('N/A'), @@ -149,7 +149,6 @@ protected function _prepareColumns() $this->addColumn('updated_at', [ 'header' => Mage::helper('sales')->__('Updated At'), 'index' => 'agreement_updated_at', - 'width' => 1, 'type' => 'datetime', 'align' => 'center', 'default' => $this->__('N/A'), 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..44a8dbbfb7a 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 @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php index af53317b506..dff0b552e56 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php index 8836e902157..dcde02fd80c 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php index 78ca83e9775..9371f90ed76 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml billing agreement related orders tab * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Billing_Agreement_View_Tab_Orders extends Mage_Adminhtml_Block_Sales_Order_Grid implements Mage_Adminhtml_Block_Widget_Tab_Interface { @@ -71,7 +74,7 @@ public function getTabTitle() /** * Can show tab in tabs * - * @return boolean + * @return bool */ public function canShowTab() { @@ -81,7 +84,7 @@ public function canShowTab() /** * Tab is hidden * - * @return boolean + * @return bool */ public function isHidden() { 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..f05d108a1e1 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 @@ -7,28 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Customer/Edit/Tab/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php index 9bd1d8efceb..c91bad398b5 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -72,7 +73,7 @@ public function getTabTitle() /** * Can show tab in tabs * - * @return boolean + * @return bool */ public function canShowTab() { @@ -83,7 +84,7 @@ public function canShowTab() /** * Tab is hidden * - * @return boolean + * @return bool */ public function isHidden() { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php index a463d765883..9ae8648a0f4 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml customer recurring profiles tab * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Customer_Edit_Tab_Recurring_Profile extends Mage_Sales_Block_Adminhtml_Recurring_Profile_Grid implements Mage_Adminhtml_Block_Widget_Tab_Interface { @@ -58,7 +61,7 @@ public function getTabTitle() /** * Can show tab in tabs * - * @return boolean + * @return bool */ public function canShowTab() { @@ -69,7 +72,7 @@ public function canShowTab() /** * Tab is hidden * - * @return boolean + * @return bool */ public function isHidden() { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php index 0cb1edc2225..a59b668b15f 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Adminhtml sales orders block + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Recurring_Profile extends Mage_Adminhtml_Block_Widget_Grid_Container { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php index edfe872e359..e5f345808bd 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -219,7 +220,7 @@ protected function _getPeriodUnitOptions($emptyLabel) /** * Set readonly flag * - * @param boolean $isReadonly + * @param bool $isReadonly * @return $this */ public function setIsReadonly($isReadonly) @@ -231,7 +232,7 @@ public function setIsReadonly($isReadonly) /** * Get readonly flag * - * @return boolean + * @return bool */ public function getIsReadonly() { diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php index f3e9795bdc0..06b5a62d2e1 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -91,7 +92,6 @@ protected function _prepareColumns() 'index' => 'created_at', 'type' => 'datetime', 'html_decorators' => ['nobr'], - 'width' => 1, ]); $this->addColumn('updated_at', [ @@ -99,7 +99,6 @@ protected function _prepareColumns() 'index' => 'updated_at', 'type' => 'datetime', 'html_decorators' => ['nobr'], - 'width' => 1, ]); $methods = []; 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..2ac8febbb3a 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 @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Adminhtml/Recurring/Profile/View/Getawayinfo.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php index 1c7d71ed0d5..f6f0f19f642 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php index b964a058406..7cff6d34903 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php index a68499479bb..2ea0c872133 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Adminhtml - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Adminhtml_Block_Sales_Recurring_Profile_View_Items extends Mage_Adminhtml_Block_Sales_Items_Abstract { @@ -59,7 +60,7 @@ public function getItem() } /** - * Retrieve formated price + * Retrieve formatted price * * @param float $value * @return string diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php index b51015c5f1a..038a99ced37 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php index 5fea3a85865..992b567dff2 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profile orders grid + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Adminhtml_Recurring_Profile_View_Tab_Orders extends Mage_Adminhtml_Block_Widget_Grid implements Mage_Adminhtml_Block_Widget_Tab_Interface { @@ -79,7 +84,6 @@ protected function _prepareColumns() 'header' => Mage::helper('sales')->__('Purchased On'), 'index' => 'created_at', 'type' => 'datetime', - 'width' => '100px', ]); $this->addColumn('billing_name', [ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php index 827f5df1b36..d2d6fed2f6d 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php index 6fed543fe2d..5771a2b841c 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php index 40659e148ff..c3edfdc37c3 100644 --- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php +++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form/Order.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Sales * @author Magento Core Team */ - class Mage_Sales_Block_Adminhtml_Report_Filter_Form_Order extends Mage_Sales_Block_Adminhtml_Report_Filter_Form { /** 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..de200799450 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Billing/Agreements.php b/app/code/core/Mage/Sales/Block/Billing/Agreements.php index 361394ad178..320ec9746ff 100644 --- a/app/code/core/Mage/Sales/Block/Billing/Agreements.php +++ b/app/code/core/Mage/Sales/Block/Billing/Agreements.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Guest/Links.php b/app/code/core/Mage/Sales/Block/Guest/Links.php index 7a2be3b51a3..6df0131d109 100644 --- a/app/code/core/Mage/Sales/Block/Guest/Links.php +++ b/app/code/core/Mage/Sales/Block/Guest/Links.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Links block * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Guest_Links extends Mage_Page_Block_Template_Links_Block { diff --git a/app/code/core/Mage/Sales/Block/Items/Abstract.php b/app/code/core/Mage/Sales/Block/Items/Abstract.php index 5d60bcbee1a..b3833b92bb2 100644 --- a/app/code/core/Mage/Sales/Block/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Block/Items/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Comments.php b/app/code/core/Mage/Sales/Block/Order/Comments.php index 7432495269e..2a911d47141 100644 --- a/app/code/core/Mage/Sales/Block/Order/Comments.php +++ b/app/code/core/Mage/Sales/Block/Order/Comments.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php index ae368c42333..2dd6f83c7d2 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php index 97569fcf170..8f873e27e5e 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php index 6d308a145e6..93cf662354b 100644 --- a/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Creditmemo/Totals.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Details.php b/app/code/core/Mage/Sales/Block/Order/Details.php index 9ba4773d37e..0520885f21a 100644 --- a/app/code/core/Mage/Sales/Block/Order/Details.php +++ b/app/code/core/Mage/Sales/Block/Order/Details.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php index d4fb707b62d..61d47a79edb 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Creditmemo/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php index 1b0ce2bc0e6..90420b51615 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Invoice/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Items.php index 61c3ae6b376..9943a6eb979 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,5 +28,4 @@ */ class Mage_Sales_Block_Order_Email_Items extends Mage_Sales_Block_Items_Abstract { - } diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php index 5739aeb0fcf..4f1855a5738 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php index b79eadc1eb1..caa1b1e18c0 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php index 50333743143..14a04331e2c 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Items/Order/Grouped.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php b/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php index 37d3182ab4c..940195a40dd 100644 --- a/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Email/Shipment/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/History.php b/app/code/core/Mage/Sales/Block/Order/History.php index e5fb48cd00b..2779bf64dd3 100644 --- a/app/code/core/Mage/Sales/Block/Order/History.php +++ b/app/code/core/Mage/Sales/Block/Order/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Info.php b/app/code/core/Mage/Sales/Block/Order/Info.php index 48871e649b4..4391b2e44c7 100644 --- a/app/code/core/Mage/Sales/Block/Order/Info.php +++ b/app/code/core/Mage/Sales/Block/Order/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php b/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php index 12d5e02dbf8..1b9943b776b 100644 --- a/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php +++ b/app/code/core/Mage/Sales/Block/Order/Info/Buttons.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Invoice.php index 71e400cc420..cd3db6dc774 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Block_Order_Invoice extends Mage_Sales_Block_Order_Invoice_Items { diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php index bc3640b8526..58ec3b2790c 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php index a72cb7bb123..a8728c4a051 100644 --- a/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Invoice/Totals.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Item/Renderer/Default.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php index 96a547e96ba..13d7651e2ee 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php index c0c5ccc26c8..67261afc96f 100644 --- a/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php +++ b/app/code/core/Mage/Sales/Block/Order/Item/Renderer/Grouped.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Items.php b/app/code/core/Mage/Sales/Block/Order/Items.php index 1152d486e2c..1d9cc7b8444 100644 --- a/app/code/core/Mage/Sales/Block/Order/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Items.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Print.php b/app/code/core/Mage/Sales/Block/Order/Print.php index e21190b615c..1398c773550 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print.php +++ b/app/code/core/Mage/Sales/Block/Order/Print.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,6 +24,7 @@ * * @category Mage * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Block_Order_Print extends Mage_Sales_Block_Items_Abstract { diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php index dc9276ee2ba..1a16c66d4cc 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php index aa8ae96803f..ae4c8427bca 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Invoice.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Block_Order_Print_Invoice extends Mage_Sales_Block_Items_Abstract { 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..c8140c892ab 100644 --- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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/Recent.php b/app/code/core/Mage/Sales/Block/Order/Recent.php index f788c0e889a..73fb80cf56b 100644 --- a/app/code/core/Mage/Sales/Block/Order/Recent.php +++ b/app/code/core/Mage/Sales/Block/Order/Recent.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team * * @method Mage_Sales_Model_Resource_Order_Collection getOrders() * @method $this setOrders(Mage_Sales_Model_Resource_Order_Collection $orders) diff --git a/app/code/core/Mage/Sales/Block/Order/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Shipment.php index 9eb87ee0dc1..763c73f5ae6 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Shipment/Items.php b/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php index 6f2ae061bad..035bc2ff566 100644 --- a/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php +++ b/app/code/core/Mage/Sales/Block/Order/Shipment/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Block/Order/Tax.php b/app/code/core/Mage/Sales/Block/Order/Tax.php index f73dd376357..a4e036f4291 100644 --- a/app/code/core/Mage/Sales/Block/Order/Tax.php +++ b/app/code/core/Mage/Sales/Block/Order/Tax.php @@ -7,24 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..97a7ca13955 100644 --- a/app/code/core/Mage/Sales/Block/Order/Totals.php +++ b/app/code/core/Mage/Sales/Block/Order/Totals.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -236,10 +243,7 @@ public function addTotalBefore(Varien_Object $total, $before = null) */ public function getTotal($code) { - if (isset($this->_totals[$code])) { - return $this->_totals[$code]; - } - return false; + return $this->_totals[$code] ?? false; } /** diff --git a/app/code/core/Mage/Sales/Block/Order/View.php b/app/code/core/Mage/Sales/Block/Order/View.php index 379b3770e4e..660817d4a1d 100644 --- a/app/code/core/Mage/Sales/Block/Order/View.php +++ b/app/code/core/Mage/Sales/Block/Order/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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/Payment/Form/Billing/Agreement.php b/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php index 02d209cd348..5f57b25b7e5 100644 --- a/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Payment/Form/Billing/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php b/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php index dc3e21a874d..6bc970ca648 100644 --- a/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Block/Payment/Info/Billing/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,7 @@ class Mage_Sales_Block_Payment_Info_Billing_Agreement extends Mage_Payment_Block * Add reference id to payment method information * * @param Varien_Object|array $transport - * @return array|Varien_Object|null + * @return Varien_Object|null */ protected function _prepareSpecificInformation($transport = null) { 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..02f88fe6175 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Recurring/Profiles.php b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php index 981e16d4290..47b9febd7b7 100644 --- a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php +++ b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profiles listing * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method $this setBackUrl(string $value) * @method $this setGridColumns(Varien_Object[] $profiles) * @method $this setGridElements(Varien_Object[] $profiles) diff --git a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php index 8d4e08089cb..4c445fed1ee 100644 --- a/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php +++ b/app/code/core/Mage/Sales/Block/Reorder/Sidebar.php @@ -7,27 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -92,7 +93,7 @@ public function getItems() * Check item product availability for reorder * * @param Mage_Sales_Model_Order_Item $orderItem - * @return boolean + * @return bool */ public function isItemAvailableForReorder(Mage_Sales_Model_Order_Item $orderItem) { diff --git a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php index 4e2b293b2d1..9d33dbda8c3 100644 --- a/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php +++ b/app/code/core/Mage/Sales/Block/Widget/Guest/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Controller/Abstract.php b/app/code/core/Mage/Sales/Controller/Abstract.php index fff56a5c996..0067ab80989 100644 --- a/app/code/core/Mage/Sales/Controller/Abstract.php +++ b/app/code/core/Mage/Sales/Controller/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Exception.php b/app/code/core/Mage/Sales/Exception.php index f248c4f6135..7e761713430 100644 --- a/app/code/core/Mage/Sales/Exception.php +++ b/app/code/core/Mage/Sales/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Helper/Data.php b/app/code/core/Mage/Sales/Helper/Data.php index 795de997f07..003d66385b9 100644 --- a/app/code/core/Mage/Sales/Helper/Data.php +++ b/app/code/core/Mage/Sales/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -37,6 +38,8 @@ class Mage_Sales_Helper_Data extends Mage_Core_Helper_Data */ const PRECISION_VALUE = 0.0001; + protected $_moduleName = 'Mage_Sales'; + /** * Check quote amount * diff --git a/app/code/core/Mage/Sales/Helper/Guest.php b/app/code/core/Mage/Sales/Helper/Guest.php index 6f4c4dc0e7c..950a60d8fcf 100644 --- a/app/code/core/Mage/Sales/Helper/Guest.php +++ b/app/code/core/Mage/Sales/Helper/Guest.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,6 +28,8 @@ */ class Mage_Sales_Helper_Guest extends Mage_Core_Helper_Data { + protected $_moduleName = 'Mage_Sales'; + /** * Cookie params */ @@ -158,8 +161,8 @@ protected function _loadOrderByCookie($cookie = null) { if (!is_null($cookie)) { $cookieData = explode(':', base64_decode($cookie)); - $protectCode = isset($cookieData[0]) ? $cookieData[0] : null; - $incrementId = isset($cookieData[1]) ? $cookieData[1] : null; + $protectCode = $cookieData[0] ?? null; + $incrementId = $cookieData[1] ?? null; if (!empty($protectCode) && !empty($incrementId)) { /** @var Mage_Sales_Model_Order $order */ diff --git a/app/code/core/Mage/Sales/Helper/Reorder.php b/app/code/core/Mage/Sales/Helper/Reorder.php index d9d3c2db3cb..da65d8ab39e 100644 --- a/app/code/core/Mage/Sales/Helper/Reorder.php +++ b/app/code/core/Mage/Sales/Helper/Reorder.php @@ -7,26 +7,31 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales module base helper * - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Helper_Reorder extends Mage_Core_Helper_Data { const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow'; + protected $_moduleName = 'Mage_Sales'; + /** * @return bool */ diff --git a/app/code/core/Mage/Sales/Model/Abstract.php b/app/code/core/Mage/Sales/Model/Abstract.php index c6286ae7c15..f172485287c 100644 --- a/app/code/core/Mage/Sales/Model/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Api/Resource.php b/app/code/core/Mage/Sales/Model/Api/Resource.php index 88fffd22799..4a362a4039f 100644 --- a/app/code/core/Mage/Sales/Model/Api/Resource.php +++ b/app/code/core/Mage/Sales/Model/Api/Resource.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -51,7 +52,7 @@ class Mage_Sales_Model_Api_Resource extends Mage_Api_Model_Resource_Abstract * @param array $data * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array $attributes + * @param array|null $attributes * @return $this */ protected function _updateAttributes($data, $object, $type, array $attributes = null) @@ -71,7 +72,7 @@ protected function _updateAttributes($data, $object, $type, array $attributes = * * @param Mage_Core_Model_Abstract $object * @param string $type - * @param array $attributes + * @param array|null $attributes * @return array */ protected function _getAttributes($object, $type, array $attributes = null) @@ -108,8 +109,8 @@ protected function _getAttributes($object, $type, array $attributes = null) * * @param string $attributeCode * @param string $type - * @param array $attributes - * @return boolean + * @param array|null $attributes + * @return bool */ protected function _isAllowedAttribute($attributeCode, $type, array $attributes = null) { diff --git a/app/code/core/Mage/Sales/Model/Api2/Order.php b/app/code/core/Mage/Sales/Model/Api2/Order.php index 5bf14a4fd4b..1706e51ce1e 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address.php index 9aa1264f37c..9628fb21630 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php index 9f6534b9fb2..c6854b565cb 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Address/Rest/Admin/V1.php index 24483393aaf..bf4a606d0a2 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..c393a9de2e5 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php index bd70737b205..ebf360630d1 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php index a10e3263dd0..fb07e796017 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -47,7 +48,7 @@ protected function _retrieveCollection() $this->_applyCollectionModifiers($collection); $data = $collection->load()->toArray(); - return isset($data['items']) ? $data['items'] : $data; + return $data['items'] ?? $data; } /** 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 8a473f00028..a02984d1a8b 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..610e3a0abf1 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item.php index 872811c69ba..d1ee8f744f0 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php index cfb536b9635..be2c51ad07a 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Item/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bb303334b45 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..bc874b3c3e9 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php index 19c6168dd9e..2bf85ca837d 100644 --- a/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php +++ b/app/code/core/Mage/Sales/Model/Api2/Order/Rest.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bf34d01b4ca 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..db0e68bfcb4 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Billing/Agreement.php index 06283d31a9e..422fd1b1fcb 100644 --- a/app/code/core/Mage/Sales/Model/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Billing/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,7 +70,6 @@ class Mage_Sales_Model_Billing_Agreement extends Mage_Payment_Model_Billing_Agre /** * Init model - * */ protected function _construct() { @@ -79,7 +79,7 @@ protected function _construct() /** * Set created_at parameter * - * @return Mage_Core_Model_Abstract + * @inheritdoc */ protected function _beforeSave() { @@ -118,6 +118,7 @@ public function getStatusLabel() case self::STATUS_CANCELED: return Mage::helper('sales')->__('Canceled'); } + return ''; } /** @@ -149,7 +150,7 @@ public function verifyToken() * Check for permissions * * @param int $customerIdSession - * @return boolean + * @return bool */ public function canPerformAction($customerIdSession) { diff --git a/app/code/core/Mage/Sales/Model/Config.php b/app/code/core/Mage/Sales/Model/Config.php index 5c347a6111a..7ff302b6c46 100644 --- a/app/code/core/Mage/Sales/Model/Config.php +++ b/app/code/core/Mage/Sales/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Config/Ordered.php b/app/code/core/Mage/Sales/Model/Config/Ordered.php index 9b2b6f89152..74d5bfc9fec 100644 --- a/app/code/core/Mage/Sales/Model/Config/Ordered.php +++ b/app/code/core/Mage/Sales/Model/Config/Ordered.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Configuration class for ordered items * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ abstract class Mage_Sales_Model_Config_Ordered extends Mage_Core_Model_Config_Base { diff --git a/app/code/core/Mage/Sales/Model/Convert/Order.php b/app/code/core/Mage/Sales/Model/Convert/Order.php index 688363c7c6b..321e0191d6c 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Order.php +++ b/app/code/core/Mage/Sales/Model/Convert/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order data convert model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Convert_Order extends Varien_Object { diff --git a/app/code/core/Mage/Sales/Model/Convert/Quote.php b/app/code/core/Mage/Sales/Model/Convert/Quote.php index fa075918dbd..43f5dc2908d 100644 --- a/app/code/core/Mage/Sales/Model/Convert/Quote.php +++ b/app/code/core/Mage/Sales/Model/Convert/Quote.php @@ -7,27 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote data convert model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Convert_Quote extends Varien_Object { - /** * Convert quote model to order model * diff --git a/app/code/core/Mage/Sales/Model/Email/Template.php b/app/code/core/Mage/Sales/Model/Email/Template.php index 4fbd4018c37..8ea9c624ebb 100644 --- a/app/code/core/Mage/Sales/Model/Email/Template.php +++ b/app/code/core/Mage/Sales/Model/Email/Template.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Sales/Model/Entity/Order.php index 91b17f5baf1..dbcf8305066 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +23,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Model_Entity_Order extends Mage_Eav_Model_Entity_Abstract { - public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address.php index c4abc505d79..e9daaacb967 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php index 073b670a079..a7575412f73 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php index da762a1e0aa..18cc5a4b880 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Billing.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php index b20b25bb65a..d0f64652267 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php index baf44af51d5..c316dc6639c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Parent.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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_Order_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** 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..938322b5921 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php index 8a46e5fb0a0..38e2a2b31b1 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php index 0fc0b5fac2b..04df42702bf 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php index 916439d82f8..48688564632 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php index cfda6cffaef..a5139d1f296 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Attribute/Backend/Parent.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @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_Order_Creditmemo_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php index 7fcfe4d8744..a1e66b15451 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php index e2685bb129f..8f5a9f1807d 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php index b7a3dbff168..797c43d85a7 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php index 87e54d925ba..c3b8e1ace50 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Creditmemo_Item extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php index 818f7f8da34..741dbe5107e 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php index 9134b3a7a91..b7b1ac4a611 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Model_Entity_Order_Invoice extends Mage_Eav_Model_Entity_Abstract { public function __construct() diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php index c7bea18e8ff..23eb1d93e9b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php index bee9a5ae790..d016f1ec01c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Item.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Order_Invoice_Attribute_Backend_Item extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php index 33138efe3a1..c499bc226d3 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Order.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Order_Invoice_Attribute_Backend_Order extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php index 0302c4fed40..1b0f636a422 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Attribute/Backend/Parent.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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_Order_Invoice_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php index de856de7cdf..e311683658c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php index 0355b7340d7..ece6cf1bcd8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php index 38f24aca679..c375c7f46c6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php index c59f86ab2e8..5d9822befc7 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Order_Invoice_Item extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php index 339b3b0b113..6fbc2c73d5f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item.php index 6a48d0a6c7c..c21af38137a 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +24,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Model_Entity_Order_Item extends Mage_Eav_Model_Entity_Abstract { - public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php index 0b8541e1351..5b45a37b010 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php index 3a937d29739..30419317cf7 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +24,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_Model_Entity_Order_Payment extends Mage_Eav_Model_Entity_Abstract { - public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php index 63232b07771..a1b1d2a4afc 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..04407aebde8 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php index f730d9e2909..5e88d630888 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php index 1a68eac38ca..3d2bbdde18b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Attribute/Backend/Parent.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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_Order_Shipment_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php index 426f76dd746..55339781380 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php index 584e0311611..697858ddd61 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php index 58747ed833f..14a413b6c96 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php index 25445b3bfbf..fc5fd70c0a1 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Item extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php index cc17ff13f2d..c77a8daaf3f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..4937f1dd6a2 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 @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php index e681ed778fa..166e6e9ee09 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php index d2a39da3b0b..746c654db8f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php index 4a74fa88fcf..401c2ec1031 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote.php b/app/code/core/Mage/Sales/Model/Entity/Quote.php index 52b64134c38..6cf0cc1b8f2 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Quote extends Mage_Eav_Model_Entity_Abstract { - public function __construct() { $resource = Mage::getSingleton('core/resource'); diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php index 94ed936148e..239d5182704 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php index 0f58b458d59..c3135e274a9 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php index c1be388dd6d..1dbc9f6e80f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php index 588785ff691..a5c797bdd3d 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Parent.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2021 The OpenMage Contributors (https://www.openmage.org) + * @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_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php index 7a4f4f02c53..d8a1b14c1a6 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Backend/Region.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Backend_Region extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { /** diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php index 82b9ac629a2..44439e309a5 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..93762e652a8 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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 */ 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/Discount.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php index e1e6fbc82d5..2b199ce0131 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php index ac98fb74c0b..bf6c891c32b 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Grand.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..f36a135c24e 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..4effff243b4 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..542371cdc96 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php index 35718eda128..730e2d86cae 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php index c4880ff6113..d14e2c03c41 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Quote_Address_Item extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php index 9349e8f5b8e..fb690ba7668 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php index cb3186853ce..259868dc1cb 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_Quote_Address_Rate extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php index 716961723f1..e71ae3d0db3 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php index cbf072bcb91..9fb7cabb202 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php index a6219236e6c..dca9ea308d0 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Quote_Item extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php index 07236a76bdd..191fff0b471 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,7 +112,8 @@ protected function _afterLoad() } /** - * @return bool + * @return false|Mage_Catalog_Model_Resource_Product_Collection + * @throws Mage_Core_Exception */ protected function _getProductCollection() { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php index b9ed00473ed..c8391323056 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,7 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sales_Model_Entity_Quote_Payment extends Mage_Eav_Model_Entity_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php index 38a9048e65e..dbb2aaf53f3 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php index 771cef6ab79..d1a3abf224c 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -112,7 +113,7 @@ public function load($printQuery = false, $logQuery = false) if (! empty($values)) { foreach ($values as $v) { $obj = new Varien_Object($v); - $storeName = isset($stores[$obj->getStoreId()]) ? $stores[$obj->getStoreId()] : null; + $storeName = $stores[$obj->getStoreId()] ?? null; $this->_items[ $v['store_id'] ] = $obj; $this->_items[ $v['store_id'] ]->setStoreName($storeName); @@ -132,8 +133,8 @@ public function load($printQuery = false, $logQuery = false) /** * Print and/or log query * - * @param boolean $printQuery - * @param boolean $logQuery + * @param bool $printQuery + * @param bool $logQuery * @param null|string $sql * @return Mage_Sales_Model_Entity_Sale_Collection */ diff --git a/app/code/core/Mage/Sales/Model/Entity/Setup.php b/app/code/core/Mage/Sales/Model/Entity/Setup.php index 2f403b19006..3dfaf11446f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Setup.php +++ b/app/code/core/Mage/Sales/Model/Entity/Setup.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php index ff48df4c26b..068afa2d657 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php index 001b287c014..454b37d8d63 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php index 1cd3ef708eb..aa6114e8a3f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Billing/Agreement/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php index 5528db10239..6f2036036a8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order.php index 5e38e131e14..0fa3867530c 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order 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 extends Mage_Sales_Model_Resource_Order diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php index cd29763d338..b7052174b2e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php index cc67be9af17..5671c7addf6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php index 51ca0b33064..bd5c9b4730e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Address/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php index 86fc129fc3f..e1b5692693a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Billing.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php index de5c894b358..226da8f4f74 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php index 30e40190fd5..00e4dc96696 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Attribute/Backend/Parent.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Attribute_Backend_Parent 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..c6d754c0831 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php index 35ab0109ead..cad9d357df1 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php index e18c662e802..e78f85a7ced 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php index 13dc714bcd8..6c9e4e19487 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Comment/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php index 03fbba6f62f..41f67f2f522 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php index 676af30c74c..3aded8aafcc 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php index 329d7dbf336..545cee5a24d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Attribute/Backend/Parent.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Creditmemo_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php index e535b67857e..14edf014bb7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php index fd48e2d2df2..983e8b87a2a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php index d70265e6420..ef90ac5cce5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Comment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php index a69e9981c06..b1f9a734977 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Grid/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php index 7bfb31fc840..d105faf2452 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order creditmemo item 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_Creditmemo_Item extends Mage_Sales_Model_Resource_Order_Creditmemo_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php index a5c5644e091..2f9e388be38 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Creditmemo/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php index bb02b4d08c0..2895f41f08a 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Grid/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php index 97d8878cd98..6eb5ffb563b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order invoice 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_Invoice extends Mage_Sales_Model_Resource_Order_Invoice diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php index 53d7ca6d8a8..9cd591905cd 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php index 76d07cdef5d..7ad17aec89d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Item.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoice_Attribute_Backend_Item extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php index de4ab5989b5..393434678ef 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Order.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoice_Attribute_Backend_Order extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php index c7a1b5cc853..59080016ae0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Attribute/Backend/Parent.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoice_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php index 6c3ff1501f8..0f544908dc6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php index db923850505..3a37ed6acba 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php index 9ca99d4ead3..33c65bf7af7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Comment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php index edb9aa789fe..d198080a518 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Grid/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php index 77ebff098e1..2535799efc8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order invoice item 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_Invoice_Item extends Mage_Sales_Model_Resource_Order_Invoice_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php index cc3b88422f7..72826870e45 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Invoice/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php index 59e2159bdcb..e25d1a2fbc6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order item 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_Item extends Mage_Sales_Model_Resource_Order_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php index 943f5685bd2..fddc0b6d5e2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php index ad5d5cbcc70..8d5b4fcdfb5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order payment 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_Payment extends Mage_Sales_Model_Resource_Order_Payment diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php index ac936bc2f2f..f00090782c9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..3735ca28358 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php index 82fcbda0334..23dea698f5e 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Payment/Transaction/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..441603e7d60 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php index a1e2e5d3c31..52ff65518a3 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php index a04f2127c13..15e511d0443 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Attribute/Backend/Parent.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Shipment_Attribute_Backend_Parent extends Mage_Sales_Model_Resource_Order_Shipment_Attribute_Backend_Parent diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php index 16ece564817..3f217c6a18f 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php index 10d6d1ad8a2..334687f19fd 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php index e98a862d3f2..8e732f43a6c 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Comment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php index 38a68f919a7..1725145aab7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Grid/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php index 2fe3bbd20e7..224c189739d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order shipment item 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_Item extends Mage_Sales_Model_Resource_Order_Shipment_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php index 0ae504f27a2..9a46dcfba85 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..dd01b7278aa 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php index 0c40867b2d1..d122db074d8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Shipment/Track/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..227baea2980 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Status/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php index 3a8bd6b953d..ba656dd933d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php index e2cc30483b5..63b3aeeb0f9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php index 0d77b63cc63..6324ae36ba8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Status/History/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..d319294cd91 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php index 84b47fb0475..c0672a65739 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Order/Tax/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php index 966f2d457c8..72083eae51d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote mysql4 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_Quote extends Mage_Sales_Model_Resource_Quote diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php index c64b35d6d3f..99b4e20ecf9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php index aac782bd135..bf687c395b9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php index 6bca0b3a5d8..77000b3b087 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php index eb7ad4f0ebb..7de4aee81eb 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Parent.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Backend_Parent extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Parent diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php index 411afa2d8fb..61f0ee6e1c5 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Backend/Region.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Backend_Region extends Mage_Sales_Model_Resource_Quote_Address_Attribute_Backend_Region diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php index 971d76e2ec0..4f7033dead7 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php index 23e53ed7550..0dc5e1a8fc9 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Custbalance.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php index 3157f8f2bcd..f8450584cd2 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php index 39dc0c79b50..29b3d6ba912 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Attribute/Frontend/Grand.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..8afb0a79001 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..873674775a8 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ac6633dcbb7 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php index c9e36fa64c9..a5087e96c26 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php index 8320f9935b3..2b65ee8924d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address item mysql4 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_Quote_Address_Item extends Mage_Sales_Model_Resource_Quote_Address_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php index 279ae589460..10fb5621f1b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php index 354eb0192fc..e81d0857da6 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address shipping rate mysql4 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_Quote_Address_Rate extends Mage_Sales_Model_Resource_Quote_Address_Rate diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php index f622b114ca1..48d77477139 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Address/Rate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php index 9badde0d912..3485c484a5d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php index f8edf8a8fe6..1fcd758cc27 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote mysql4 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_Quote_Item extends Mage_Sales_Model_Resource_Quote_Item diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php index 3b9183a6851..69abe87b640 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php index 1349929b1e7..886a4b8f242 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Item option mysql4 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_Quote_Item_Option extends Mage_Sales_Model_Resource_Quote_Item_Option diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php index 7f142cc1076..9783cd5be1c 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Item/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php index 0c06322f1d5..0d2c24e3f83 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote payment mysql4 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_Quote_Payment extends Mage_Sales_Model_Resource_Quote_Payment diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php index f2c7808e726..b396ab79e23 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Quote/Payment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php index 1a699949b7a..1083458a953 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring payment profiles 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_Recurring_Profile extends Mage_Sales_Model_Resource_Recurring_Profile diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php index 73f86322633..24ef4c451e8 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Recurring/Profile/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report.php b/app/code/core/Mage/Sales/Model/Mysql4/Report.php index 0104faeba17..a21bc16f0ff 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 extends Mage_Sales_Model_Resource_Report diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php index acfa52811c8..e9ac0c74c93 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php index e00778f2725..231ded022c1 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php index 82139df876f..92c135e1b54 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Bestsellers/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php index 1df3d51b883..8696c87af66 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php index 0e9f419eb4d..21b51282794 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php index 7c90077a2e2..1ba4c13dbd0 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Invoiced.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report invoiced 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_Invoiced_Collection_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Invoiced diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php index 93ad4287e3e..e28b994c923 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Invoiced/Collection/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report invoiced 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_Invoiced_Collection_Order extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php index 44151ff3bd8..23e969c862d 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order entity 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_Report_Order extends Mage_Sales_Model_Resource_Report_Order diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php index c8ea1f05a92..d15d7e77112 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php index 72870a7a2fa..b69450e891b 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Order/Updatedat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php index 645add0a2d6..d9cf9139007 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Refunded extends Mage_Sales_Model_Resource_Report_Refunded diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php index 8dbf79a6ddf..ba2c1e41fbe 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report refunded 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_Refunded_Collection_Order extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Order diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php index c47bb2afdd3..b65eccc2582 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Refunded/Collection/Refunded.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report refunded 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_Refunded_Collection_Refunded extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Refunded 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..25264f0da30 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Order.php b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php index 6cd02ee5a71..174450403f3 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Report/Shipping/Collection/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Order extends Mage_Sales_Model_Resource_Report_Shipping_Collection_Order 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..901e863470a 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php index 6306e2f230d..eb9528a17be 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Sale/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php index 6bdc94f043b..602ed323e19 100644 --- a/app/code/core/Mage/Sales/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sales/Model/Mysql4/Setup.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php index 6e2d6eda5da..89c8d63eedc 100644 --- a/app/code/core/Mage/Sales/Model/Observer.php +++ b/app/code/core/Mage/Sales/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -507,7 +508,7 @@ public function changeQuoteCustomerGroupId(Varien_Event_Observer $observer) 'is_valid' => (int)$quoteAddress->getVatIsValid(), 'request_identifier' => (string)$quoteAddress->getVatRequestId(), 'request_date' => (string)$quoteAddress->getVatRequestDate(), - 'request_success' => (boolean)$quoteAddress->getVatRequestSuccess() + 'request_success' => (bool)$quoteAddress->getVatRequestSuccess() ]); } diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php index ec6a4d8a468..de4b5b1c28f 100644 --- a/app/code/core/Mage/Sales/Model/Order.php +++ b/app/code/core/Mage/Sales/Model/Order.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2015-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,6 +29,10 @@ * sales_order_delete_before * sales_order_delete_after * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order _getResource() * @method Mage_Sales_Model_Resource_Order getResource() * @method Mage_Sales_Model_Resource_Order_Collection getCollection() @@ -360,10 +365,6 @@ * * @method string getXForwardedFor() * @method $this setXForwardedFor(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract { @@ -504,9 +505,6 @@ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract */ protected $_historyEntityName = self::HISTORY_ENTITY_NAME; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order'); @@ -548,26 +546,23 @@ public function unsetData($key = null) * Retrieve can flag for action (edit, unhold, etc..) * * @param string $action - * @return boolean|null + * @return bool|null */ public function getActionFlag($action) { - if (isset($this->_actionFlag[$action])) { - return $this->_actionFlag[$action]; - } - return null; + return $this->_actionFlag[$action] ?? null; } /** * Set can flag value for action (edit, unhold, etc...) * * @param string $action - * @param boolean $flag + * @param bool $flag * @return $this */ public function setActionFlag($action, $flag) { - $this->_actionFlag[$action] = (boolean) $flag; + $this->_actionFlag[$action] = (bool) $flag; return $this; } @@ -589,7 +584,7 @@ public function getCanSendNewEmailFlag() */ public function setCanSendNewEmailFlag($flag) { - $this->_canSendNewEmailFlag = (boolean) $flag; + $this->_canSendNewEmailFlag = (bool) $flag; return $this; } @@ -1483,7 +1478,7 @@ public function sendNewOrderEmail() /** * Queue email with order update information * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @param bool $forceMode if true then email will be sent regardless of the fact that it was already sent previously * @@ -1995,7 +1990,7 @@ public function getOrderCurrency() } /** - * Get formated price value including order currency rate to order website currency + * Get formatted price value including order currency rate to order website currency * * @param float $price * @param bool $addBrackets @@ -2018,7 +2013,7 @@ public function formatPricePrecision($price, $precision, $addBrackets = false) } /** - * Retrieve text formated price value includeing order rate + * Retrieve text formatted price value including order rate * * @param float $price * @return string @@ -2198,7 +2193,7 @@ public function getTracksCollection() /** * Check order invoices availability * - * @return bool + * @return int */ public function hasInvoices() { @@ -2275,7 +2270,7 @@ public function addRelatedObject(Mage_Core_Model_Abstract $object) } /** - * Get formated order created date in store timezone + * Get formatted order created date in store timezone * * @param string $format date format type (short|medium|long|full) * @return string diff --git a/app/code/core/Mage/Sales/Model/Order/Address.php b/app/code/core/Mage/Sales/Model/Order/Address.php index 1776d46b28c..a19453af8b0 100644 --- a/app/code/core/Mage/Sales/Model/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Order/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @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/Api.php b/app/code/core/Mage/Sales/Model/Order/Api.php index bfb04595460..dc9d543d34b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -177,8 +178,8 @@ public function info($orderIncrementId) * @param string $orderIncrementId * @param string $status * @param string $comment - * @param boolean $notify - * @return boolean + * @param bool $notify + * @return bool */ public function addComment($orderIncrementId, $status, $comment = '', $notify = false) { @@ -212,7 +213,7 @@ public function addComment($orderIncrementId, $status, $comment = '', $notify = * Hold order * * @param string $orderIncrementId - * @return boolean + * @return bool */ public function hold($orderIncrementId) { @@ -232,7 +233,7 @@ public function hold($orderIncrementId) * Unhold order * * @param string $orderIncrementId - * @return boolean + * @return bool */ public function unhold($orderIncrementId) { @@ -252,7 +253,7 @@ public function unhold($orderIncrementId) * Cancel order * * @param string $orderIncrementId - * @return boolean + * @return bool */ public function cancel($orderIncrementId) { 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..afbc271d0e3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Api/V2.php +++ b/app/code/core/Mage/Sales/Model/Order/Api/V2.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..c8269b26c66 100644 --- a/app/code/core/Mage/Sales/Model/Order/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,9 +42,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.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php index 4f77e113aef..01f677f9c7b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -747,7 +748,7 @@ public function getCommentsCollection($reload = false) /** * Send email with creditmemo data * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @return $this */ @@ -847,7 +848,7 @@ public function sendEmail($notifyCustomer = true, $comment = '') /** * Send email with creditmemo update information * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @return $this */ diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php index 25ccb3fe288..ca70c9d2780 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -190,9 +191,9 @@ public function create( * * @param string $creditmemoIncrementId * @param string $comment - * @param boolean $notifyCustomer - * @param boolean $includeComment - * @return boolean + * @param bool $notifyCustomer + * @param bool $includeComment + * @return bool */ public function addComment($creditmemoIncrementId, $comment, $notifyCustomer = false, $includeComment = false) { @@ -212,7 +213,7 @@ public function addComment($creditmemoIncrementId, $comment, $notifyCustomer = f * Cancel credit memo * * @param string $creditmemoIncrementId - * @return boolean + * @return bool */ public function cancel($creditmemoIncrementId) { @@ -233,12 +234,12 @@ public function cancel($creditmemoIncrementId) /** * Hook method, could be replaced in derived classes * - * @param array $data + * @param array|null $data * @return array */ protected function _prepareCreateData($data) { - $data = isset($data) ? $data : []; + $data = $data ?? []; if (isset($data['qtys']) && count($data['qtys'])) { $qtysArray = []; @@ -261,7 +262,7 @@ protected function _prepareCreateData($data) * Load CreditMemo by IncrementId * * @param mixed $incrementId - * @return Mage_Core_Model_Abstract|Mage_Sales_Model_Order_Creditmemo + * @return Mage_Sales_Model_Order_Creditmemo */ protected function _getCreditmemo($incrementId) { 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..b243f3db814 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,7 +28,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/Comment.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php index 11c20055bd2..9ce9643bc29 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,9 +47,6 @@ class Mage_Sales_Model_Order_Creditmemo_Comment extends Mage_Sales_Model_Abstrac */ protected $_creditmemo; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_creditmemo_comment'); 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..7181531e807 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Config.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -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/Item.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php index 2bc5eab977b..67d7528c934 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Creditmemo_Item _getResource() * @method Mage_Sales_Model_Resource_Order_Creditmemo_Item getResource() * @method Mage_Sales_Model_Resource_Order_Creditmemo_Item_Collection getCollection() @@ -105,10 +110,6 @@ * @method $this setWeeeTaxDisposition(float $value) * @method float getWeeeTaxRowDisposition() * @method $this setWeeeTaxRowDisposition(float $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Creditmemo_Item extends Mage_Core_Model_Abstract { @@ -117,9 +118,6 @@ class Mage_Sales_Model_Order_Creditmemo_Item extends Mage_Core_Model_Abstract protected $_creditmemo = null; protected $_orderItem = null; - /** - * Initialize resource model - */ public function _construct() { $this->_init('sales/order_creditmemo_item'); diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php index 19b96a30086..8742804bb48 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Abstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Creditmemo/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php index e6369bba916..ee031d11887 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Cost.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @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/Creditmemo/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php index ed5ee7f2cdf..46036d0f0f1 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Creditmemo/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php index 0a06d8b8706..2983c3db70d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Grand.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php index 6c70f7c9635..7ef4e449820 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..abdafe71346 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ba6b64471f2 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php index 861f6b9a8b1..9189c210bf6 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoice _getResource() * @method Mage_Sales_Model_Resource_Order_Invoice getResource() * @method string getBackUrl() @@ -114,10 +119,6 @@ * @method float getBaseCost() * @method string getRequestedCaptureCase() * @method $this setBaseCost(float $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Invoice extends Mage_Sales_Model_Abstract { @@ -630,10 +631,7 @@ public function getStateName($stateId = null) if (is_null(self::$_states)) { self::getStates(); } - if (isset(self::$_states[$stateId])) { - return self::$_states[$stateId]; - } - return Mage::helper('sales')->__('Unknown State'); + return self::$_states[$stateId] ?? Mage::helper('sales')->__('Unknown State'); } /** @@ -782,7 +780,7 @@ public function getCommentsCollection($reload = false) /** * Send email with invoice data * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @return $this */ @@ -882,7 +880,7 @@ public function sendEmail($notifyCustomer = true, $comment = '') /** * Send email with invoice update information * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @return $this */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php index d80e574892b..3ed6bfe2752 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,11 +117,11 @@ public function info($invoiceIncrementId) * @param string $orderIncrementId * @param array $itemsQty * @param string $comment - * @param boolean $email - * @param boolean $includeComment + * @param bool $email + * @param bool $includeComment * @return string */ - public function create($orderIncrementId, $itemsQty, $comment = null, $email = false, $includeComment = false) + public function create($orderIncrementId, $itemsQty = [], $comment = null, $email = false, $includeComment = false) { $order = Mage::getModel('sales/order')->loadByIncrementId($orderIncrementId); @@ -172,9 +173,9 @@ public function create($orderIncrementId, $itemsQty, $comment = null, $email = f * * @param string $invoiceIncrementId * @param string $comment - * @param boolean $email - * @param boolean $includeComment - * @return boolean + * @param bool $email + * @param bool $includeComment + * @return bool */ public function addComment($invoiceIncrementId, $comment, $email = false, $includeComment = false) { @@ -201,7 +202,7 @@ public function addComment($invoiceIncrementId, $comment, $email = false, $inclu * Capture invoice * * @param string $invoiceIncrementId - * @return boolean + * @return bool */ public function capture($invoiceIncrementId) { @@ -274,7 +275,7 @@ public function void($invoiceIncrementId) * Cancel invoice * * @param string $invoiceIncrementId - * @return boolean + * @return bool */ public function cancel($invoiceIncrementId) { 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..c2ca41fe3fd 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -37,7 +38,7 @@ class Mage_Sales_Model_Order_Invoice_Api_V2 extends Mage_Sales_Model_Order_Invoi * @param bool $includeComment * @return string */ - public function create($invoiceIncrementId, $itemsQty, $comment = null, $email = false, $includeComment = false) + public function create($invoiceIncrementId, $itemsQty = [], $comment = null, $email = false, $includeComment = false) { $order = Mage::getModel('sales/order')->loadByIncrementId($invoiceIncrementId); $itemsQty = $this->_prepareItemQtyData($itemsQty); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php index b839679b90e..7df45e4a8f8 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -46,9 +47,6 @@ class Mage_Sales_Model_Order_Invoice_Comment extends Mage_Sales_Model_Abstract */ protected $_invoice; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_invoice_comment'); 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..fde2380e29e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Config.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -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/Item.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php index e67c7410a00..252fbc058c3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Invoice_Item _getResource() * @method Mage_Sales_Model_Resource_Order_Invoice_Item getResource() * @method int getParentId() @@ -85,10 +90,6 @@ * @method float getBaseHiddenTaxAmount() * @method Mage_Sales_Model_Order_Invoice_Item setBaseHiddenTaxAmount(float $value) * @method Mage_Sales_Model_Order_Invoice_Item setStoreId(int $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Invoice_Item extends Mage_Core_Model_Abstract { @@ -97,12 +98,10 @@ class Mage_Sales_Model_Order_Invoice_Item extends Mage_Core_Model_Abstract /** @var Mage_Sales_Model_Order_Invoice */ protected $_invoice = null; + /** @var Mage_Sales_Model_Order_Item */ protected $_orderItem = null; - /** - * Initialize resource model - */ public function _construct() { $this->_init('sales/order_invoice_item'); diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php index 892d8078903..993dc848c61 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Abstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Total/Cost.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php index 0993bbf9f5b..c009de21292 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Cost.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @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/Total/Discount.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php index 50428c15073..ba2b4fc5830 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Total/Grand.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php index 9aa3fe9397c..ca306d823f8 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Grand.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Total/Shipping.php index 161b1febc82..54265c2fa78 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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..602c73e9c70 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7d4191b5a5b 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -117,7 +122,7 @@ public function collect(Mage_Sales_Model_Order_Invoice $invoice) /** * Check if shipping tax calculation can be included to current invoice * @param Mage_Sales_Model_Order_Invoice $invoice - * @return boolean + * @return bool */ protected function _canIncludeShipping($invoice) { diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php index 54744217aad..ed25f90f068 100644 --- a/app/code/core/Mage/Sales/Model/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Sales_Model_Order_Item * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Item _getResource() * @method Mage_Sales_Model_Resource_Order_Item getResource() * @method Mage_Sales_Model_Resource_Order_Item_Collection getCollection() @@ -190,14 +195,9 @@ * @method $this setQuoteParentItemId(int $value) * @method int getParentProductId() * @method int getQuoteParentItemId() - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Item extends Mage_Core_Model_Abstract { - const STATUS_PENDING = 1; // No items shipped, invoiced, canceled, refunded nor backordered const STATUS_SHIPPED = 2; // When qty ordered - [qty canceled + qty returned] = qty shipped const STATUS_INVOICED = 9; // When qty ordered - [qty canceled + qty returned] = qty invoiced @@ -543,10 +543,7 @@ public static function getStatusName($statusId) if (is_null(self::$_statuses)) { self::getStatuses(); } - if (isset(self::$_statuses[$statusId])) { - return self::$_statuses[$statusId]; - } - return Mage::helper('sales')->__('Unknown Status'); + return self::$_statuses[$statusId] ?? Mage::helper('sales')->__('Unknown Status'); } /** @@ -646,10 +643,7 @@ public function getProductOptionByCode($code = null) if (is_null($code)) { return $options; } - if (isset($options[$code])) { - return $options[$code]; - } - return null; + return $options[$code] ?? null; } /** @@ -840,8 +834,7 @@ public function getBaseDiscountAppliedForWeeeTax() if (isset($weeeTaxAppliedAmount['total_base_weee_discount'])) { return $weeeTaxAppliedAmount['total_base_weee_discount']; } else { - $totalDiscount += isset($weeeTaxAppliedAmount['base_weee_discount']) - ? $weeeTaxAppliedAmount['base_weee_discount'] : 0; + $totalDiscount += $weeeTaxAppliedAmount['base_weee_discount'] ?? 0; } } return $totalDiscount; @@ -863,8 +856,7 @@ public function getDiscountAppliedForWeeeTax() if (isset($weeeTaxAppliedAmount['total_weee_discount'])) { return $weeeTaxAppliedAmount['total_weee_discount']; } else { - $totalDiscount += isset($weeeTaxAppliedAmount['weee_discount']) - ? $weeeTaxAppliedAmount['weee_discount'] : 0; + $totalDiscount += $weeeTaxAppliedAmount['weee_discount'] ?? 0; } } return $totalDiscount; diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php index 74a75f6ab13..e064d363401 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order payment information * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Payment _getResource() * @method Mage_Sales_Model_Resource_Order_Payment getResource() * @method Mage_Sales_Model_Resource_Order_Payment_Collection getCollection() @@ -193,10 +198,6 @@ * @method $this unsTransactionId() * * @method $this setVoidTransactionId(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info { @@ -245,15 +246,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'; @@ -265,9 +262,6 @@ class Mage_Sales_Model_Order_Payment extends Mage_Payment_Model_Info */ protected $_transactionAdditionalInfo = []; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_payment'); @@ -418,7 +412,7 @@ public function place() } } } - $isCustomerNotified = ($orderIsNotified !== null) ? $orderIsNotified : $order->getCustomerNoteNotify(); + $isCustomerNotified = $orderIsNotified ?? $order->getCustomerNoteNotify(); $message = $order->getCustomerNote(); // add message if order was put into review during authorization or capture @@ -1416,7 +1410,7 @@ protected function _avoidDoubleTransactionProcessing($txnId = null) * Check transaction existence by specified transaction id * * @param string $txnId - * @return boolean + * @return bool */ protected function _isTransactionExists($txnId = null) { @@ -1681,7 +1675,7 @@ public function getTransactionAdditionalInfo($key = null) if (is_null($key)) { return $this->_transactionAdditionalInfo; } - return isset($this->_transactionAdditionalInfo[$key]) ? $this->_transactionAdditionalInfo[$key] : null; + return $this->_transactionAdditionalInfo[$key] ?? null; } /** 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..1714be703cc 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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 +118,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'); @@ -590,7 +582,7 @@ public function getOrder() * Set order instance for transaction depends on transaction behavior * If $order equals to true, method isn't loading new order instance. * - * @param Mage_Sales_Model_Order_Payment|null|boolean $order + * @param Mage_Sales_Model_Order_Payment|null|bool $order * @return $this */ public function setOrder($order = null) diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php index 9c28ca2f10a..7e101d1d516 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -896,7 +897,7 @@ public function drawLineBlocks(Zend_Pdf_Page $page, array $draw, array $pageSett Mage::throwException(Mage::helper('sales')->__('Invalid draw line data. Please define "lines" array.')); } $lines = $itemsProp['lines']; - $height = isset($itemsProp['height']) ? $itemsProp['height'] : 10; + $height = $itemsProp['height'] ?? 10; if (empty($itemsProp['shift'])) { $shift = 0; diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php index 87d3ba60287..23c13de2930 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php index 9c55971b0e8..6127862f115 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php index 7df3e760684..1fb71338aca 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php index a3a177f27dd..d599296b0c5 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -105,7 +106,7 @@ public function draw() ]; // draw options value - $_printValue = isset($option['print_value']) ? $option['print_value'] : strip_tags($option['value']); + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $lines[][] = [ 'text' => Mage::helper('core/string')->str_split($_printValue, 30, true, true), 'feed' => 40 diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php index 2cc721e504d..4d8e361f7f3 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Creditmemo/Grouped.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php index f0f67137397..9552b736692 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -116,11 +117,7 @@ public function draw() ]; if ($option['value']) { - if (isset($option['print_value'])) { - $_printValue = $option['print_value']; - } else { - $_printValue = strip_tags($option['value']); - } + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $values = explode(', ', $_printValue); foreach ($values as $value) { $lines[][] = [ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php index 71ddcb2cc3d..c5620e5ad35 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Invoice/Grouped.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php index 513bef89df0..b3caf9778e9 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Items/Shipment/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -69,9 +70,7 @@ public function draw() // draw options value if ($option['value']) { - $_printValue = isset($option['print_value']) - ? $option['print_value'] - : strip_tags($option['value']); + $_printValue = $option['print_value'] ?? strip_tags($option['value']); $values = explode(', ', $_printValue); foreach ($values as $value) { $lines[][] = [ 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..4f3cfc3fdba 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php index 0bb9a03e5bc..6760196a89e 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment/Packaging.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php index 58c42d600ea..4cbd0e24877 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Total/Default.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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 be3a7db6d79..5acfcf0ce62 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +57,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 { @@ -422,7 +423,7 @@ public function getCommentsCollection($reload = false) /** * Send email with shipment data * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @return $this */ @@ -517,7 +518,7 @@ public function sendEmail($notifyCustomer = true, $comment = '') /** * Send email with shipment update information * - * @param boolean $notifyCustomer + * @param bool $notifyCustomer * @param string $comment * @return $this */ diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php index 6c20bbde969..bd588e3ec3b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -111,8 +112,8 @@ public function info($shipmentIncrementId) * @param string $orderIncrementId * @param array $itemsQty * @param string $comment - * @param boolean $email - * @param boolean $includeComment + * @param bool $email + * @param bool $includeComment * @return string */ public function create( @@ -210,7 +211,7 @@ public function addTrack($shipmentIncrementId, $carrier, $title, $trackNumber, $ * * @param string $shipmentIncrementId * @param int $trackId - * @return boolean + * @return bool */ public function removeTrack($shipmentIncrementId, $trackId) { @@ -298,9 +299,9 @@ public function infoTrack($shipmentIncrementId, $trackId) * * @param string $shipmentIncrementId * @param string $comment - * @param boolean $email - * @param boolean $includeInEmail - * @return boolean + * @param bool $email + * @param bool $includeInEmail + * @return bool */ public function addComment($shipmentIncrementId, $comment, $email = false, $includeInEmail = false) { 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..3f9e29c1def 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -48,8 +49,8 @@ protected function _prepareItemQtyData($data) * @param string $orderIncrementId * @param array $itemsQty * @param string $comment - * @param boolean $email - * @param boolean $includeComment + * @param bool $email + * @param bool $includeComment * @return string */ public function create( diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php index f796c75b7af..41806f3c78f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -49,9 +50,6 @@ class Mage_Sales_Model_Order_Shipment_Comment extends Mage_Sales_Model_Abstract */ protected $_shipment; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_shipment_comment'); diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php index 7d8d932bb06..20aa8a850b2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Sales_Model_Order_Shipment_Item * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Order_Shipment_Item _getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Item getResource() * @method Mage_Sales_Model_Resource_Order_Shipment_Item_Collection getCollection() @@ -46,10 +51,6 @@ * @method $this setSku(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_Item extends Mage_Core_Model_Abstract { @@ -59,9 +60,6 @@ class Mage_Sales_Model_Order_Shipment_Item extends Mage_Core_Model_Abstract protected $_shipment = null; protected $_orderItem = null; - /** - * Initialize resource model - */ public function _construct() { $this->_init('sales/order_shipment_item'); 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..7aa7aa8328d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Track.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +50,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..1f6fc772bf4 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Order/Status.php @@ -7,19 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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() @@ -39,7 +45,7 @@ protected function _construct() * Assign order status to particular state * * @param string $state - * @param boolean $isDefault make the status as default one for state + * @param bool $isDefault make the status as default one for state * @return $this */ public function assignState($state, $isDefault = false) diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php index 1f927e779aa..17281695262 100644 --- a/app/code/core/Mage/Sales/Model/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -62,9 +63,6 @@ class Mage_Sales_Model_Order_Status_History extends Mage_Sales_Model_Abstract protected $_eventPrefix = 'sales_order_status_history'; protected $_eventObject = 'status_history'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/order_status_history'); @@ -101,7 +99,7 @@ public function setIsCustomerNotified($flag = null) /** * Customer Notification Applicable check method * - * @return boolean + * @return bool */ public function isCustomerNotificationNotApplicable() { diff --git a/app/code/core/Mage/Sales/Model/Order/Tax.php b/app/code/core/Mage/Sales/Model/Order/Tax.php index 9406d615d0a..5b8417a908c 100644 --- a/app/code/core/Mage/Sales/Model/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Order/Tax.php @@ -7,18 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +48,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..ba84b1af288 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total.php +++ b/app/code/core/Mage/Sales/Model/Order/Total.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Order/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php index 54a32069c5f..e0ba502d464 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Total/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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/Total/Config/Base.php b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php index 39a1a38a20a..50cb64fd7fa 100644 --- a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php +++ b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php b/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php index 4cdb55aa167..dc3c298dc06 100644 --- a/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php +++ b/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index 3f60639233f..85906650fd3 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -28,6 +29,10 @@ * sales_quote_delete_before * sales_quote_delete_after * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Quote _getResource() * @method Mage_Sales_Model_Resource_Quote getResource() * @@ -179,10 +184,6 @@ * @method $this setWebsite(Mage_Core_Model_Website $value) * * @method $this setXForwardedFor(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Quote extends Mage_Core_Model_Abstract { @@ -458,10 +459,11 @@ public function assignCustomer(Mage_Customer_Model_Customer $customer) /** * Assign customer model to quote with billing and shipping address change * - * @param Mage_Customer_Model_Customer $customer - * @param Mage_Sales_Model_Quote_Address $billingAddress - * @param Mage_Sales_Model_Quote_Address $shippingAddress + * @param Mage_Customer_Model_Customer $customer + * @param Mage_Sales_Model_Quote_Address|null $billingAddress + * @param Mage_Sales_Model_Quote_Address|null $shippingAddress * @return $this + * @throws Mage_Core_Exception */ public function assignCustomerWithAddressChange( Mage_Customer_Model_Customer $customer, @@ -2045,7 +2047,7 @@ protected function _afterLoad() * Return quote checkout method code * * @deprecated after 1.4 beta1 it is checkout module responsibility - * @param boolean $originalMethod if true return defined method from begining + * @param bool $originalMethod if true return defined method from begining * @return string */ public function getCheckoutMethod($originalMethod = false) diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php index 3ef7d0f5e7f..2ec4abbea27 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -973,7 +974,7 @@ public function collectShippingRates() * Request shipping rates for entire address or specified address item * Returns true if current selected shipping method code corresponds to one of the found rates * - * @param Mage_Sales_Model_Quote_Item_Abstract $item + * @param Mage_Sales_Model_Quote_Item_Abstract|null $item * @return bool */ public function requestShippingRates(Mage_Sales_Model_Quote_Item_Abstract $item = null) @@ -1287,10 +1288,7 @@ public function addBaseTotalAmount($code, $amount) */ public function getTotalAmount($code) { - if (isset($this->_totalAmounts[$code])) { - return $this->_totalAmounts[$code]; - } - return 0; + return $this->_totalAmounts[$code] ?? 0; } /** @@ -1301,10 +1299,7 @@ public function getTotalAmount($code) */ public function getBaseTotalAmount($code) { - if (isset($this->_baseTotalAmounts[$code])) { - return $this->_baseTotalAmounts[$code]; - } - return 0; + return $this->_baseTotalAmounts[$code] ?? 0; } /** diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php index b8f1d5b74df..88bec805e1e 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Item.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Quote_Address_Item _getResource() * @method Mage_Sales_Model_Resource_Quote_Address_Item getResource() * @method Mage_Sales_Model_Resource_Quote_Address_Item_Collection getCollection() @@ -108,10 +113,6 @@ * @method $this setQuoteItemImported(bool $value) * @method $this setProductType(string $value) * @method int getCustomerAddressId() - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Item extends Mage_Sales_Model_Quote_Item_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php index 99ba8f21b34..b5ccf64531a 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Rate.php @@ -7,18 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Quote_Address_Rate _getResource() * @method Mage_Sales_Model_Resource_Quote_Address_Rate getResource() * @method Mage_Sales_Model_Resource_Quote_Address_Rate_Collection getCollection() @@ -45,10 +51,6 @@ * @method $this setErrorMessage(string $value) * @method string getMethodTitle() * @method $this setMethodTitle(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Rate extends Mage_Shipping_Model_Rate_Abstract { 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..a18f304ee3e 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php index 22280e6760b..3ab0d4595eb 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -115,7 +116,7 @@ public function fetch(Mage_Sales_Model_Quote_Address $address) } /** - * Set address shich can be used inside totals calculation + * Set address which can be used inside totals calculation * * @param Mage_Sales_Model_Quote_Address $address * @return Mage_Sales_Model_Quote_Address_Total_Abstract @@ -238,7 +239,7 @@ public function getItemBaseRowTotal(Mage_Sales_Model_Quote_Item_Abstract $item) } /** - * Whether the item row total may be compouded with others + * Whether the item row total may be compounded with others * * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return bool diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php index 9278fd033d0..52c23102b27 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,7 @@ * Address Total Collector model * * @category Mage - * @package Mage_Core + * @package Mage_Sales * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Collector extends Mage_Sales_Model_Config_Ordered 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..4924221e62e 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @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 */ 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/Discount.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php index a01fe001c15..8a483d6d66e 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php index 3cfdbdc1fc4..945f8739398 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Grand.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php index ca9f2b580c0..5cce59a7fab 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Msrp.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php index 6f52e977441..f9fc10c5658 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal.php @@ -7,21 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Nominal items total * Collects only items segregated by isNominal property * Aggregates row totals per item + * + * @category Mage + * @package Mage_Checkout + * @author Magento Core Team */ class Mage_Sales_Model_Quote_Address_Total_Nominal extends Mage_Sales_Model_Quote_Address_Total_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php index 03566f3a5cd..91a065eec34 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Collector.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php index 54ff49a07a8..57085356593 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/Recurring/Initial.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..6f189420960 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/RecurringAbstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php index 59418ac0182..d1bc7cc7b35 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Nominal/RecurringAbstract.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Total model for recurring profiles + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ abstract class Mage_Sales_Model_Quote_Address_Total_Nominal_RecurringAbstract extends Mage_Sales_Model_Quote_Address_Total_Abstract { 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..93cef7d358f 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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..2fd859c8739 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 @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..087515ec37c 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ae06ae990f1 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..775c28ede04 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Quote/Config.php b/app/code/core/Mage/Sales/Model/Quote/Config.php index 47e45df6eae..cbf91d6a45d 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Config.php +++ b/app/code/core/Mage/Sales/Model/Quote/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php index fff95293930..ba5384a0e0c 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales Quote Item Model * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Quote_Item _getResource() * @method Mage_Sales_Model_Resource_Quote_Item getResource() * @method Mage_Sales_Model_Resource_Quote_Item_Collection getCollection() @@ -105,6 +110,7 @@ * @method $this setParentProductId(int $value) * @method int getProductId() * @method $this setProductId(int $value) + * @method $this setProductOrderOptions(array $value) * @method $this setProductType(string $value) * @method float getPriceInclTax() * @method $this setPriceInclTax(float $value) @@ -159,10 +165,6 @@ * @method $this setWeeeTaxRowDisposition(float $value) * @method float getWeight() * @method $this setWeight(float $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Quote_Item extends Mage_Sales_Model_Quote_Item_Abstract { @@ -223,10 +225,6 @@ class Mage_Sales_Model_Quote_Item extends Mage_Sales_Model_Quote_Item_Abstract */ protected $_errorInfos = null; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('sales/quote_item'); @@ -732,7 +730,7 @@ public function getOptionByCode($code) * Checks that item model has data changes. * Call save item options if model isn't need to save in DB * - * @return boolean + * @return bool */ protected function _hasModelChanged() { diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php index 5a6d6cc5885..88eb4791136 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -26,7 +27,7 @@ * - original_price - product price before any calculations * - calculation_price - prices for item totals calculation * - custom_price - new price that can be declared by user and recalculated during calculation process - * - original_custom_price - original defined value of custom price without any convertion + * - original_custom_price - original defined value of custom price without any conversion * * @category Mage * @package Mage_Sales @@ -192,6 +193,11 @@ abstract class Mage_Sales_Model_Quote_Item_Abstract extends Mage_Core_Model_Abst */ protected $_messages = []; + /** + * @var array + */ + protected $_optionsByCode; + /** * Retrieve Quote instance * @@ -279,7 +285,7 @@ public function getParentItem() } /** - * Get chil items + * Get child items * * @return $this[] */ @@ -722,7 +728,7 @@ public function isChildrenCalculated() } /** - * Checking can we ship product separatelly (each child separately) + * Checking can we ship product separately (each child separately) * or each parent product item can be shipped only like one item * * @return bool diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php index 19fd6280be4..cfac36e7497 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Quote/Item/Option.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Item option model * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Quote_Item_Option _getResource() * @method Mage_Sales_Model_Resource_Quote_Item_Option getResource() * @method Mage_Sales_Model_Resource_Quote_Item_Option_Collection getCollection() @@ -37,19 +42,12 @@ * @method string getCode() * @method $this setCode(string $value) * @method $this setValue(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Quote_Item_Option extends Mage_Core_Model_Abstract implements Mage_Catalog_Model_Product_Configuration_Item_Option_Interface { protected $_item; protected $_product; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/quote_item_option'); @@ -58,7 +56,7 @@ protected function _construct() /** * Checks that item option model has data changes * - * @return boolean + * @return bool */ protected function _hasModelChanged() { diff --git a/app/code/core/Mage/Sales/Model/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Quote/Payment.php index 569d557f550..bbfabdb2df3 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Quote/Payment.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote payment information * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Quote_Payment _getResource() * @method Mage_Sales_Model_Resource_Quote_Payment getResource() * @method Mage_Sales_Model_Resource_Quote_Payment_Collection getCollection() @@ -84,10 +89,6 @@ * * @method string getUpdatedAt() * @method $this setUpdatedAt(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Quote_Payment extends Mage_Payment_Model_Info { @@ -96,9 +97,6 @@ class Mage_Sales_Model_Quote_Payment extends Mage_Payment_Model_Info protected $_quote; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/quote_payment'); diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php index 45d98742263..917218875c0 100644 --- a/app/code/core/Mage/Sales/Model/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Recurring/Profile.php @@ -7,21 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales implementation of recurring payment profiles * Implements saving and manageing profiles * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method Mage_Sales_Model_Resource_Recurring_Profile _getResource() * @method Mage_Sales_Model_Resource_Recurring_Profile getResource() * @method string getState() @@ -90,10 +95,6 @@ * @method $this setAdditionalInfo(string $value) * @method Mage_Sales_Model_Quote getQuote() * @method $this setNewState(string $value) - * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team */ class Mage_Sales_Model_Recurring_Profile extends Mage_Payment_Model_Recurring_Profile { @@ -458,6 +459,7 @@ public function getFieldComment($field) default: return parent::getFieldComment($field); } + return null; } /** @@ -550,9 +552,6 @@ public function getInfoValue($infoKey, $infoValueKey) } } - /** - * Initialize resource model - */ protected function _construct() { $this->_init('sales/recurring_profile'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Abstract.php index 4d748ab47e8..2a0709cd61b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php index 82a452ea0a4..6befbcbbd94 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php +++ b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Sales_Model_Resource_Billing_Agreement extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/billing_agreement', 'agreement_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php index c4cdadd21ee..dbfbec2209d 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Billing/Agreement/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php index c22fd974014..e89f7b67f39 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,7 +66,7 @@ public function addAttributeToSelect($attribute) * Backward compatibility with EAV collection * * @param string|Mage_Eav_Model_Entity_Attribute $attribute - * @param array|integer|string|null $condition + * @param array|int|string|null $condition * @return $this */ public function addAttributeToFilter($attribute, $condition = null) @@ -92,8 +93,8 @@ public function addAttributeToSort($attribute, $dir = 'asc') * Set collection page start and records to show * Backward compatibility with EAV collection * - * @param integer $pageNum - * @param integer $pageSize + * @param int $pageNum + * @param int $pageSize * @return $this */ public function setPage($pageNum, $pageSize) diff --git a/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php b/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php index 2f97a1b4da4..e4c0995df6c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php +++ b/app/code/core/Mage/Sales/Model/Resource/Helper/Interface.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales resource helper interface * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ interface Mage_Sales_Model_Resource_Helper_Interface { diff --git a/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php index 6e547936ab6..09c2ef27793 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php +++ b/app/code/core/Mage/Sales/Model/Resource/Helper/Mysql4.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales Mysql resource helper model * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Helper_Mysql4 extends Mage_Core_Model_Resource_Helper_Mysql4 implements Mage_Sales_Model_Resource_Helper_Interface { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order.php index e0471046284..3d2d20ea130 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order.php @@ -7,36 +7,33 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order 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 extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_resource'; /** - * Event object - * * @var string */ protected $_eventObject = 'resource'; @@ -49,9 +46,7 @@ class Mage_Sales_Model_Resource_Order extends Mage_Sales_Model_Resource_Order_Ab protected $_grid = true; /** - * Use increment id - * - * @var boolean + * @var bool */ protected $_useIncrementId = true; @@ -62,10 +57,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..c7093d67bfa 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,21 +31,21 @@ abstract class Mage_Sales_Model_Resource_Order_Abstract extends Mage_Sales_Model /** * Is grid available * - * @var boolean + * @var bool */ protected $_grid = false; /** * Use additional is object new check for this resource * - * @var boolean + * @var bool */ protected $_useIsObjectNew = true; /** * Flag for using of increment id * - * @var boolean + * @var bool */ protected $_useIncrementId = false; @@ -70,15 +71,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'; @@ -264,7 +261,7 @@ public function getGridColumns() /** * Retrieve grid table * - * @return string + * @return string|false */ public function getGridTable() { 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 892e1cd9516..d2b91ce08b4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,16 +29,10 @@ class Mage_Sales_Model_Resource_Order_Address extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_address_resource'; - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/order_address', 'entity_id'); 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..c709811408a 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,23 +32,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/Billing.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php index de64f953105..71bf5da5284 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php index e4f8550b062..6e6c1a888bb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php index 3124e7e6a27..23de894b1fd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Parent.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice backend model for parent attribute * - * @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_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { 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..aa2a0ba47eb 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..2b2d7f4a850 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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'); @@ -185,7 +178,7 @@ public function addFieldToSearchFilter($field, $condition = null) * Specify collection select filter by attribute value * * @param array $attributes - * @param array|integer|string|null $condition + * @param array|int|string|null $condition * @return $this */ public function addAttributeToSearchFilter($attributes, $condition = null) diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php index a3bfe98a715..b2d234e2760 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php index ec9836fe8d4..270d7a1594a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Comment/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..0bcde2ca0ac 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,8 +29,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 +54,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/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php index 45fe5ac3ead..bb928a95893 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php index 1911f9cea9c..12cc87b5a4a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Attribute/Backend/Parent.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice backend model for parent attribute * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Creditmemo_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { 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..0b00d8e0c5d 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,15 +29,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 +45,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..edc6124e0b5 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,16 +29,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..5c12b3bd0ad 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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..438a839aacc 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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.php b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php index c256b9c93d1..5c90c9934f3 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Creditmemo/Item.php @@ -7,37 +7,30 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order creditmemo item 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_Creditmemo_Item extends Mage_Sales_Model_Resource_Order_Abstract { - /** - * Event prefix - * - * @var string - */ + /** @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_resource'; - /** - * Model initialization - * - */ protected function _construct() { $this->_init('sales/creditmemo_item', 'entity_id'); 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..c6ee8f6c762 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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..d42122ab9e9 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,30 +29,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 078f57caec9..cf3b7969489 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice.php @@ -7,29 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order invoice 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_Invoice extends Mage_Sales_Model_Resource_Order_Abstract { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_resource'; @@ -55,10 +54,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/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php index b5298b2e6f9..bb184a4fdde 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php index 1464ddb6ffc..a216fd36256 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice backend model for item attribute * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Item extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php index f6e1fccf7cf..bf35d0191d4 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice backend model for order attribute * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Order extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php index ba8504053b6..6be442bc540 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Invoice/Attribute/Backend/Parent.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice backend model for parent attribute * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Resource_Order_Invoice_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { 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..d79cb58fdc8 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,15 +29,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 +45,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'); @@ -59,10 +52,11 @@ protected function _construct() /** * Used to emulate after load functionality for each item without loading them - * + * @return $this */ protected function _afterLoad() { $this->walk('afterLoad'); + return $this; } } 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..2e129bcea51 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,16 +29,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..1427c262bf8 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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..95491112e4b 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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 0c0cf92e551..b734339787a 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 @@ -7,37 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order invoice item 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_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..f6422f661ed 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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 e6d3b235fc6..406e8136912 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Item.php @@ -7,37 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order item 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_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..b5597f8a2f4 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,15 +29,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 +45,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 a6ba0fd0f55..3f0f72b54a1 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order payment 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_Payment extends Mage_Sales_Model_Resource_Order_Abstract { @@ -37,16 +38,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..d371d971c35 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,23 +32,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..9c42c82736c 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Payment/Transaction/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php index 43077429353..76d037c4414 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..1842a9ee973 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment.php @@ -7,29 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +41,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/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php index d4ee9ead515..d4b268af0c7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php index d00f0929b95..f90e1bc9789 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Parent.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice backend model for parent attribute * - * @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_Attribute_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { 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..7b33f6c937e 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,15 +32,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 +48,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..672e047dadb 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,16 +29,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..9d3231dca3b 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,23 +32,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..a01988ad576 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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 c2831f7e97c..1ef917a1c51 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 @@ -7,37 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Flat sales order shipment item 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_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..3ae3fc6b3fb 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,23 +32,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..6a9176df493 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 @@ -7,37 +7,32 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..bb82907f938 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,15 +32,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 +48,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..01634ff69c7 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php index 22bad8f2788..ff2b9a1c3d8 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php index 67060f5f883..69e0efe0d64 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Status/History.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..5a30115e856 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,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..2e4f5327ca9 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6a0222f5644 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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.php b/app/code/core/Mage/Sales/Model/Resource/Quote.php index 363dacdd66e..4ddbf4787c0 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote 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 extends Mage_Sales_Model_Resource_Abstract { @@ -149,9 +150,9 @@ public function getReservedOrderId($quote) /** * Check is order increment id use in sales/order table * - * @param string|integer $orderIncrementId + * @param string|int $orderIncrementId * - * @return boolean + * @return bool */ public function isOrderIncrementIdUsed($orderIncrementId) { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php index fc4283a58dd..929dccc3213 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php index 2b0f1e5b86d..9de50ed1561 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php index 3915169ddf7..01ac7086a0f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Child.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php index bbcf2a7d115..96254ab592e 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Parent.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** *Quote address attribute backend parent 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_Backend_Parent extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php index 74744bfa7a3..230e7556b5b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Backend/Region.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address attribute backend region resource modelarray * - * @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_Backend_Region extends Mage_Eav_Model_Entity_Attribute_Backend_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php index 2c7e0610b2d..7fdda2eab61 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php index bd0537c263b..808c5aef06c 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Custbalance.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php index 9836463fdb4..4abdbfc9076 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php index 14d94f4ba07..2353200e694 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Attribute/Frontend/Grand.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..308a9828f37 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..38e2bb1abab 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..210f1a636c9 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 ed3af7323b6..8020877632b 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,23 +29,15 @@ 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'; - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/quote_address'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php index 22480d90e74..a1e1fe3b2cd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item.php @@ -7,29 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address item 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_Item extends Mage_Sales_Model_Resource_Abstract { /** * Main table and field initialization - * */ protected function _construct() { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php index cba69396ab8..470e5814b22 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Sales_Model_Resource_Quote_Address_Item_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/quote_address_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php index f8fd83623da..0fef3379362 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote address shipping rate 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_Rate extends Mage_Sales_Model_Resource_Abstract { - /** - * Main table and field initialization - * - */ protected function _construct() { $this->_init('sales/quote_address_shipping_rate', 'rate_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php index d8994dabc07..ac4efad14c6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Address/Rate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,10 +35,6 @@ class Mage_Sales_Model_Resource_Quote_Address_Rate_Collection extends Mage_Core_ */ protected $_allowFixedOnly = false; - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/quote_address_rate'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php index 0dbb6e7a6e8..0f1bd76f4e0 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Sales_Model_Resource_Quote_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/quote'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php index e21af2c46af..2553df23471 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item.php @@ -7,29 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote 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_Item extends Mage_Sales_Model_Resource_Abstract { /** * Main table and field initialization - * */ protected function _construct() { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php index 049505218a1..f0aec79703b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -44,10 +45,6 @@ class Mage_Sales_Model_Resource_Quote_Item_Collection extends Mage_Core_Model_Re */ protected $_productIds = []; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('sales/quote_item'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php index 70160f311ba..075c3526724 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Item option 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_Item_Option extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Main table and field initialization - * - */ protected function _construct() { $this->_init('sales/quote_item_option', 'option_id'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php index 5713f2e4b0c..bf902958c39 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php index d36134aa52f..28ecb47aeeb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote payment 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_Payment extends Mage_Sales_Model_Resource_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php index f20150a515e..81f1f7f8d2f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Payment/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Sales_Model_Resource_Quote_Payment_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { $this->_init('sales/quote_payment'); diff --git a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php index facb5dd6fb8..54bd6c1ea43 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php +++ b/app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring payment profiles 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_Recurring_Profile extends Mage_Sales_Model_Resource_Abstract { 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..573487de251 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -28,15 +29,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.php b/app/code/core/Mage/Sales/Model/Resource/Report.php index aef94c4dd8f..b1caacb1896 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales 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 extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ protected function _construct() { } diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php index 45dad226510..ea211d20b6a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php index cdeee51bd54..4e3818d777f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php index f0a5370846c..795f2ec239a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php index 04884620544..47c6fa2dead 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Collection/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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 1a3090a9967..09b6cfe36ef 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Invoice 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_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/Invoiced/Collection/Invoiced.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php index d4c8c99939b..d2f8aeebc76 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report invoiced 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_Invoiced_Collection_Invoiced extends Mage_Sales_Model_Resource_Report_Invoiced_Collection_Order { diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php index ae4cfdc4ced..da5a4cbf8f2 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report invoiced 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_Invoiced_Collection_Order extends Mage_Sales_Model_Resource_Report_Collection_Abstract { 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 5c326684382..72af2ea2700 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Order entity 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_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/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php index 16b437e20fa..aacf222dabf 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..4926ebf3daf 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..1372c668168 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Order/Updatedat/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php index 0807ba53655..69aea1f6364 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Updatedat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php index f53e8b8b54a..01fdfb3841a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Refund 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_Refunded extends Mage_Sales_Model_Resource_Report_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php index 7c4cc21b4d6..82e03034b3f 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report refunded 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_Refunded_Collection_Order extends Mage_Sales_Model_Resource_Report_Collection_Abstract { diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php index f08cf76276a..a3d11bd9c49 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales report refunded 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_Refunded_Collection_Refunded extends Mage_Sales_Model_Resource_Report_Refunded_Collection_Order { 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..8c7e9d2a6e9 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Order.php b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php index 3353decf4e7..f9cbf8c83c6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Order extends Mage_Sales_Model_Resource_Report_Collection_Abstract { 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..e188e7b5c36 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php index fa6f33c9314..fca876b987b 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -56,6 +57,11 @@ class Mage_Sales_Model_Resource_Sale_Collection extends Varien_Data_Collection_D */ protected $_orderStateCondition = null; + /** + * @var array + */ + protected $_orderStateValue; + /** * Set sales order entity and establish read connection * @@ -98,8 +104,8 @@ public function addStoreFilter($storeIds) */ public function setOrderStateFilter($state, $exclude = false) { - $this->_orderStateCondition = ($exclude) ? 'NOT IN' : 'IN'; - $this->_orderStateValue = (!is_array($state)) ? [$state] : $state; + $this->_orderStateCondition = $exclude ? 'NOT IN' : 'IN'; + $this->_orderStateValue = !is_array($state) ? [$state] : $state; return $this; } @@ -178,7 +184,7 @@ public function load($printQuery = false, $logQuery = false) foreach ($data as $v) { $storeObject = new Varien_Object($v); $storeId = $v['store_id']; - $storeName = isset($stores[$storeId]) ? $stores[$storeId] : null; + $storeName = $stores[$storeId] ?? null; $storeObject->setStoreName($storeName) ->setWebsiteId(Mage::app()->getStore($storeId)->getWebsiteId()) ->setAvgNormalized($v['avgsale'] * $v['num_orders']); diff --git a/app/code/core/Mage/Sales/Model/Resource/Setup.php b/app/code/core/Mage/Sales/Model/Resource/Setup.php index 8a0d3adc44c..28f3e97a0bb 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sales/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -147,7 +148,7 @@ protected function _addGridAttribute($table, $attribute, $attr, $entityTypeId) protected function _getAttributeColumnDefinition($code, $data) { // Convert attribute type to column info - $data['type'] = isset($data['type']) ? $data['type'] : 'varchar'; + $data['type'] = $data['type'] ?? 'varchar'; $type = null; $length = null; switch ($data['type']) { @@ -180,7 +181,7 @@ protected function _getAttributeColumnDefinition($code, $data) } $data['nullable'] = isset($data['required']) ? !$data['required'] : true; - $data['comment'] = isset($data['comment']) ? $data['comment'] : ucwords(str_replace('_', ' ', $code)); + $data['comment'] = $data['comment'] ?? ucwords(str_replace('_', ' ', $code)); return $data; } diff --git a/app/code/core/Mage/Sales/Model/Service/Order.php b/app/code/core/Mage/Sales/Model/Service/Order.php index 7c25afa45fe..1270fb42d28 100644 --- a/app/code/core/Mage/Sales/Model/Service/Order.php +++ b/app/code/core/Mage/Sales/Model/Service/Order.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote submit service model * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team + * * @method $this setEmailSent(bool $value) */ class Mage_Sales_Model_Service_Order @@ -209,7 +214,7 @@ public function prepareCreditmemo($data = []) { $totalQty = 0; $creditmemo = $this->_convertor->toCreditmemo($this->_order); - $qtys = isset($data['qtys']) ? $data['qtys'] : []; + $qtys = $data['qtys'] ?? []; $this->updateLocaleNumbers($qtys); foreach ($this->_order->getAllItems() as $orderItem) { @@ -252,7 +257,7 @@ public function prepareCreditmemo($data = []) public function prepareInvoiceCreditmemo($invoice, $data = []) { $totalQty = 0; - $qtys = isset($data['qtys']) ? $data['qtys'] : []; + $qtys = $data['qtys'] ?? []; $this->updateLocaleNumbers($qtys); $creditmemo = $this->_convertor->toCreditmemo($this->_order); @@ -393,6 +398,7 @@ protected function _canInvoiceItem($item, $qtys = []) } else { return $item->getQtyToInvoice() > 0; } + return false; } /** @@ -441,6 +447,7 @@ protected function _canShipItem($item, $qtys = []) } else { return $item->getQtyToShip()>0; } + return false; } /** @@ -479,6 +486,7 @@ protected function _canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = } else { return $this->_canRefundNoDummyItem($item, $invoiceQtysRefundLimits); } + return false; } /** diff --git a/app/code/core/Mage/Sales/Model/Service/Quote.php b/app/code/core/Mage/Sales/Model/Service/Quote.php index e1bd746ddfc..c6321e60748 100644 --- a/app/code/core/Mage/Sales/Model/Service/Quote.php +++ b/app/code/core/Mage/Sales/Model/Service/Quote.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Quote submit service model + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Service_Quote { diff --git a/app/code/core/Mage/Sales/Model/Status/List.php b/app/code/core/Mage/Sales/Model/Status/List.php index be9b32d05e4..0cbaaa8ca88 100644 --- a/app/code/core/Mage/Sales/Model/Status/List.php +++ b/app/code/core/Mage/Sales/Model/Status/List.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,9 @@ * additional data. The model helps to keep track and manipulate statuses, that different modules want to set * to owner object of this model. * - * @category Mage - * @package Mage_Sales - * @author Magento Core Team + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Model_Status_List { diff --git a/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php b/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php index 3ee68fb166c..417cf6d2e7d 100644 --- a/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php +++ b/app/code/core/Mage/Sales/controllers/Billing/AgreementController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -31,7 +32,6 @@ class Mage_Sales_Billing_AgreementController extends Mage_Core_Controller_Front_ { /** * View billing agreements - * */ public function indexAction() { @@ -55,6 +55,7 @@ public function preDispatch() if (!$this->_getSession()->authenticate($this)) { $this->setFlag('', 'no-dispatch', true); } + return $this; } /** diff --git a/app/code/core/Mage/Sales/controllers/DownloadController.php b/app/code/core/Mage/Sales/controllers/DownloadController.php index 05c3524e59e..0ad8ffd372f 100644 --- a/app/code/core/Mage/Sales/controllers/DownloadController.php +++ b/app/code/core/Mage/Sales/controllers/DownloadController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/GuestController.php b/app/code/core/Mage/Sales/controllers/GuestController.php index d3c627ac989..c9f2a7d55c4 100644 --- a/app/code/core/Mage/Sales/controllers/GuestController.php +++ b/app/code/core/Mage/Sales/controllers/GuestController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/controllers/OrderController.php b/app/code/core/Mage/Sales/controllers/OrderController.php index 6ad954e2905..891816ab8d7 100644 --- a/app/code/core/Mage/Sales/controllers/OrderController.php +++ b/app/code/core/Mage/Sales/controllers/OrderController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,12 +24,10 @@ * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Sales_OrderController extends Mage_Sales_Controller_Abstract { - /** * Action predispatch * @@ -43,6 +42,7 @@ public function preDispatch() if (!Mage::getSingleton('customer/session')->authenticate($this, $loginUrl)) { $this->setFlag('', self::FLAG_NO_DISPATCH, true); } + return $this; } /** diff --git a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php index 082f243a9b9..7844b692fd8 100644 --- a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php +++ b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php @@ -7,24 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Recurring profiles view/management controller + * + * @category Mage + * @package Mage_Sales + * @author Magento Core Team */ class Mage_Sales_Recurring_ProfileController extends Mage_Core_Controller_Front_Action { /** - * * @var Mage_Customer_Model_Session */ protected $_session = null; @@ -43,6 +47,7 @@ public function preDispatch() $this->setFlag('', 'no-dispatch', true); } Mage::register('current_customer', $this->_session->getCustomer()); + return $this; } /** diff --git a/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php index bc2bbef9d8c..5c81a4ecedf 100644 --- a/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Sales/data/sales_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php index 3e2f1c86d46..d36df54f3fe 100644 --- a/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php +++ b/app/code/core/Mage/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sales/etc/adminhtml.xml b/app/code/core/Mage/Sales/etc/adminhtml.xml index e3117aa6cfe..f1057590567 100644 --- a/app/code/core/Mage/Sales/etc/adminhtml.xml +++ b/app/code/core/Mage/Sales/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 2695a772e3f..68fac7537fe 100644 --- a/app/code/core/Mage/Sales/etc/api.xml +++ b/app/code/core/Mage/Sales/etc/api.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. (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/etc/api2.xml b/app/code/core/Mage/Sales/etc/api2.xml index cc43c064319..b2befc3ca1b 100644 --- a/app/code/core/Mage/Sales/etc/api2.xml +++ b/app/code/core/Mage/Sales/etc/api2.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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 b2c79319430..75740406363 100644 --- a/app/code/core/Mage/Sales/etc/config.xml +++ b/app/code/core/Mage/Sales/etc/config.xml @@ -8,21 +8,22 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> - 1.6.0.10 + 1.6.0.11 diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml index 6180f62b0e5..bb58533cf2d 100644 --- a/app/code/core/Mage/Sales/etc/system.xml +++ b/app/code/core/Mage/Sales/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..159be61179c 100644 --- a/app/code/core/Mage/Sales/etc/widget.xml +++ b/app/code/core/Mage/Sales/etc/widget.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. (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/install-1.6.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php index a56fab2f0bd..800281e3d21 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/install-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-install-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php index 6a29e001975..c6832a9a60a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php index 1be6913fa1a..7b21a9b8e39 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.8.11.php @@ -7,28 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Sales install - * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" -- DROP TABLE IF EXISTS `{$installer->getTable('sales_counter')}`; CREATE TABLE `{$installer->getTable('sales_counter')}` ( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php index 136aad3511f..bdc2c38404f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-0.9.0.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" DROP TABLE IF EXISTS `{$installer->getTable('sales_flat_quote')}`; CREATE TABLE `{$installer->getTable('sales_flat_quote')}` ( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php index f9d8f8ac0ae..cf240846b28 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-install-1.4.0.0.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" /* Orders */ CREATE TABLE `{$installer->getTable('sales_flat_order')}` ( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php index 2d5a512b13c..cfe1b2b1ae5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.6.2-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php index c08615a5df0..32d134a8ebc 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; + $installer->installEntities(); $installer->removeEntityType('invoice_address'); $installer->removeEntityType('invoice_payment'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php index beecda1dc4d..fcd1a74ea96 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ -$installer->installEntities(); +$installer = $this; +$installer->installEntities(); $installer->startSetup(); $installer->run(" DROP TABLE IF EXISTS {$this->getTable('sales_invoice_entity_varchar')}; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php index 5c30a67d54b..ae45d128c6b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php index 856b9fec07e..3a2ffec2ca8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php index 83ae6ba7197..20d99c7d27b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.0-0.8.1.php @@ -7,17 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php index 15830aab967..c13fda1a9e1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.1-0.8.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); try { @@ -47,4 +47,5 @@ } $installer->installEntities(); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php index 9b35c346250..2f566a4d5ec 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.11-0.8.12.php @@ -7,18 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; + /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->installEntities(); $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php index 59ddf3cf209..d2316b0ac97 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.12-0.8.13.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $this */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php index 92aee39279a..a683ce980c1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php index 599ae58d34e..3d69c2883e6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.14-0.8.15.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; $this->startSetup(); + $this->run(" DROP TABLE IF EXISTS `{$installer->getTable('sales_quote')}`; CREATE TABLE `{$installer->getTable('sales_quote')}` ( @@ -382,5 +384,6 @@ DROP TABLE IF EXISTS `{$installer->getTable('sales_quote_temp_text')}`; DROP TABLE IF EXISTS `{$installer->getTable('sales_quote_temp_varchar')}`; "); + $this->endSetup(); $this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php index e8aaaa7bef1..978c56c6a16 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.15-0.8.16.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-0.8.16-0.8.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php index 72bd7621c27..760d00ca3b5 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.16-0.8.17.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; $this->startSetup(); + $this->run(" ALTER TABLE `{$installer->getTable('sales_quote_item')}` MODIFY COLUMN `weight` DECIMAL(12,4) DEFAULT '0.0000', @@ -33,5 +35,6 @@ MODIFY COLUMN `base_tax_amount` DECIMAL(12,4) DEFAULT '0.0000', MODIFY COLUMN `row_weight` DECIMAL(12,4) DEFAULT '0.0000'; "); + $this->endSetup(); $this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php index 9c1be9218cf..987e60b61bf 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.17-0.8.18.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; $this->startSetup(); + $this->run(" ALTER TABLE `{$installer->getTable('sales_quote')}` change `is_active` `is_active` tinyint (1)UNSIGNED DEFAULT '1' NULL , @@ -55,5 +57,6 @@ change `remote_ip` `remote_ip` varchar (255) NULL COLLATE utf8_general_ci , change `applied_rule_ids` `applied_rule_ids` varchar (255) NULL COLLATE utf8_general_ci "); + $this->endSetup(); $this->installEntities(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php index 7c30d6bdfc7..365520f4b6a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.18-0.8.19.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer->addAttribute('order', 'edit_increment', ['type'=>'int']); $installer->addAttribute('order', 'original_increment_id', ['type'=>'varchar']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php index 3b26187018a..44699fd860d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.19-0.8.20.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer->getConnection()->addColumn($this->getTable('sales_order'), 'subtotal_refunded', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($this->getTable('sales_order'), 'subtotal_canceled', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($this->getTable('sales_order'), 'tax_refunded', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php index 5a2a180bf52..2f566a4d5ec 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.2-0.8.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->installEntities(); $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php index 017a99de1c4..501076a4490 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.20-0.8.21.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer->getConnection()->addColumn($this->getTable('sales_order'), 'subtotal_invoiced', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($this->getTable('sales_order'), 'tax_invoiced', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($this->getTable('sales_order'), 'shipping_invoiced', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php index 37821ac77ab..7988c7f904a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.21-0.8.22.php @@ -7,28 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Add "Save in address book" attribute to quote address - * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->getConnection()->addColumn($installer->getTable('sales_quote_address'), 'save_in_address_book', 'tinyint(1) default 0 after `customer_id`'); $installer->addAttribute('quote_address', 'save_in_address_book', ['type'=>'static']); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php index 5d9be99215c..463b9426a23 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.22-0.8.23.php @@ -7,18 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; + $installer->getConnection()->addColumn($installer->getTable('sales_quote'), 'reserved_order_id', 'varchar(64) default \'\''); $installer->addAttribute('quote', 'reserved_order_id', ['type'=>'static']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php index 1711c9f55fb..7c8820b3648 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.23-0.8.24.php @@ -7,17 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; + $installer->addAttribute('order_payment', 'last_trans_id', []); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php index 39a90c9789d..ee0cc86f33d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.24-0.8.25.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer->getConnection()->addColumn($this->getTable('sales_quote_address'), 'shipping_tax_amount', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($this->getTable('sales_quote_address'), 'base_shipping_tax_amount', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php index 7985defb0da..058debf8f16 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.25-0.8.26.php @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ $installer->run(" ALTER TABLE `{$this->getTable('sales_order')}` ADD INDEX `IDX_CUSTOMER` (`customer_id`); "); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php index d416ab2d40a..872a72abb35 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.26-0.8.27.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; -$conn = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $conn */ +$conn = $installer->getConnection(); $conn->addColumn($installer->getTable('sales_quote'), 'customer_prefix', 'varchar(40) after customer_email'); $conn->addColumn($installer->getTable('sales_quote'), 'customer_middlename', 'varchar(40) after customer_firstname'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php index 63625c6da47..93953c83fed 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.27-0.8.28.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->addAttribute('quote', 'customer_prefix', ['type'=>'static']); $installer->addAttribute('quote', 'customer_middlename', ['type'=>'static']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php index f56e72522c4..93cf056bae3 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.28-0.8.29.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; -$conn = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $conn */ +$conn = $installer->getConnection(); $conn->addColumn($installer->getTable('sales_quote'), 'customer_dob', 'datetime after customer_suffix'); $installer->addAttribute('quote', 'customer_dob', ['type'=>'static', 'backend'=>'eav/entity_attribute_backend_datetime']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php index 639abc9bf81..c267d016600 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.29-0.9.0.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" CREATE TABLE `{$installer->getTable('sales_flat_quote')}` ( `entity_id` int(10) unsigned NOT NULL auto_increment, @@ -339,9 +341,8 @@ DROP TABLE IF EXISTS {$this->getTable('sales_quote_text')}; DROP TABLE IF EXISTS {$this->getTable('sales_quote_varchar')}; DROP TABLE IF EXISTS {$this->getTable('sales_quote_rule')}; - - DROP TABLE IF EXISTS {$this->getTable('sales_counter')}; DROP TABLE IF EXISTS {$this->getTable('sales_discount_coupon')}; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php index 8a197a0fbee..058602371e9 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.3-0.8.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php index 5a2a180bf52..2f566a4d5ec 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.6-0.8.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->installEntities(); $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php index 219ca9d9858..895a9864575 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.7-0.8.8.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Sales - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php index a7884e7326d..ee4e6ab9e76 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.8-0.8.9.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; -/** @var Mage_Sales_Model_Entity_Setup $installer */ +/** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$this->getTable('sales_order_entity')} MODIFY COLUMN `store_id` SMALLINT(5) UNSIGNED; "); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php index 2ef357f6d4c..78bd8f1d18d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.0-0.9.1.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; +/** @var Varien_Db_Adapter_Pdo_Mysql $conn */ $conn = $installer->getConnection(); -/** @var Varien_Db_Adapter_Pdo_Mysql $conn */ $installer->addAttribute('quote_item', 'product_type', []); $installer->addAttribute('order_item', 'product_type', []); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php index a19b10e3bc9..9082ef920b1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.1-0.9.2.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('quote_address', 'applied_taxes', ['type'=>'text']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php index 44732211df8..9cdb76063e0 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.10-0.9.11.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE `{$installer->getTable('sales_order_tax')}` ADD `base_real_amount` DECIMAL( 12, 4 ) NOT NULL; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php index 4c7bb664525..9f8817f8ae2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.11-0.9.12.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('quote_item', 'original_custom_price', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php index 1fb32acdfd5..5b5056ff628 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.12-0.9.13.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('quote', 'subtotal', ['type'=>'decimal']); $installer->addAttribute('quote', 'base_subtotal', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php index f7a1f82c1be..f5a0f29bdec 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.13-0.9.14.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php index 556b0490a9a..522377d4188 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.14-0.9.15.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->dropForeignKey($installer->getTable('sales_flat_quote_address_item'), 'FK_SALES_QUOTE_ADDRESS_ITEM_QUOTE_ITEM'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php index eeff55253a5..c393a0d11b7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.15-0.9.16.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote', 'is_changed', ['type' => 'int']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php index fc175f28662..31246a00c10 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.16-0.9.17.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote_address_rate', 'method_title', ['type' => 'text']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php index 6f669447a31..9fff770d42a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.17-0.9.18.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('order', 'shipping_tax_amount', ['type'=>'static']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php index b2311897d24..e209d55fa50 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.18-0.9.19.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE `{$this->getTable('sales_order')}` ADD INDEX `IDX_INCREMENT_ID` (`increment_id`); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php index fd0c37f2a9c..70848d3ba1a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.19-0.9.20.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('order', 'can_ship_partially', ['type'=>'int']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php index ca9dc94e03c..4a1e4da969b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.2-0.9.3.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE `{$installer->getTable('sales_flat_quote_address')}` CHANGE `applied_taxes` `applied_taxes` TEXT; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php index c8c594725e4..61126c8d46d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.20-0.9.21.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php index 9797c982981..3d76ccc56bd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.21-0.9.22.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('order', 'payment_authorization_amount', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php index 40757d16c43..21fae2345b6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.22-0.9.23.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; -$conn = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $conn */ +$conn = $installer->getConnection(); $conn->addColumn($installer->getTable('sales_flat_quote'), 'customer_dob', 'datetime after customer_suffix'); $installer->addAttribute('quote', 'customer_dob', ['type'=>'static', 'backend'=>'eav/entity_attribute_backend_datetime']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php index 79559a03071..c58b0ab8b97 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.23-0.9.24.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Entity_Setup $installer */ +$installer = $this; $installer->addAttribute('invoice', 'email_sent', ['type'=>'int']); $installer->addAttribute('shipment', 'email_sent', ['type'=>'int']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php index 9c10cdfd929..62e6d64cce3 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.24-0.9.25.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->addColumn($this->getTable('sales_order'), 'shipping_tax_refunded', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($this->getTable('sales_order'), 'base_shipping_tax_refunded', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php index 079a72983db..8e5304edd92 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.25-0.9.26.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" DELETE FROM `{$this->getTable('sales_order_tax')}` diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php index 2339779c7c3..78ea41bf38c 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.26-0.9.27.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ // very long update :) set_time_limit(0); -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->addColumn( $this->getTable('sales/quote'), diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php index c9acce50996..eefbb7cfa6d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.27-0.9.28.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php index 58d61b17434..103041f99e1 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.28-0.9.29.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->addColumn($this->getTable('sales_order'), 'discount_refunded', 'decimal(12,4) default NULL AFTER `subtotal_canceled`'); $installer->getConnection()->addColumn($this->getTable('sales_order'), 'discount_canceled', 'decimal(12,4) default NULL AFTER `discount_refunded`'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php index 341ec8e14f9..d5fdbfd6f2a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.29-0.9.30.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $tableOrder = $this->getTable('sales_order'); $tableOrderEntity = $this->getTable('sales_order_entity'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php index 0bc82cd7723..b24beceb8c6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.3-0.9.4.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" CREATE TABLE `{$installer->getTable('sales_flat_order_item')}` ( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php index 4f4a5f08ba3..4360c9c3eec 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.30-0.9.31.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'base_tax_before_discount', 'decimal(12,4)'); $installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'tax_before_discount', 'decimal(12,4)'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php index cdd23573d26..af59b1ac8de 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.31-0.9.32.php @@ -7,18 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->modifyColumn($installer->getTable('sales/quote'), 'global_currency_code', 'varchar(255)'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php index 48f1052784d..dcf03215571 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.32-0.9.33.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('order', 'ext_order_item_id', ['type' => 'varchar']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php index 62f3bacf10b..2745cc99e00 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.33-0.9.34.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote', 'ext_shipping_info', ['type' => 'text']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php index 2b32bbd8f02..d85666e3a16 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.34-0.9.35.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->removeAttribute('order', 'ext_order_item_id'); $installer->addAttribute('order_item', 'ext_order_item_id', ['type' => 'varchar']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php index f538d4347cc..060a49b8075 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.35-0.9.36.php @@ -7,16 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - -/** @var Mage_Sales_Model_Resource_Setup $installer */ -$installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php index 17a387f95fd..8460a7bef3d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.36-0.9.37.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->addAttribute('order_item', 'locked_do_invoice', ['type'=>'int', 'default' => 0]); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php index be8fee6c5fe..090c50cd4eb 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.37-0.9.38.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->run(" UPDATE `{$installer->getTable('sales_order')}` AS `s` LEFT JOIN `{$installer->getTable('customer_entity')}` AS `c` diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php index af25c361956..d67f0afb7ad 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.38-0.9.39.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->addColumn( $installer->getTable('sales_flat_quote_item'), 'store_id', @@ -53,4 +54,5 @@ $installer->addAttribute('quote_item', 'redirect_url', [ 'type' => 'varchar', ]); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php index 2938ed9173b..b7218d98351 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.39-0.9.40.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php index e92e8ff672a..500bbea59eb 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.4-0.9.5.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->getConnection()->dropColumn($installer->getTable('sales_flat_quote_item'), 'super_product_id'); $installer->getConnection()->changeColumn($installer->getTable('sales_flat_quote_item'), 'parent_product_id', 'parent_item_id', 'INTEGER UNSIGNED DEFAULT NULL'); $installer->getConnection()->addConstraint( @@ -31,4 +32,5 @@ $installer->getTable('sales_flat_quote_item'), 'item_id' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php index 8b110631ff6..ad8662eecf4 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.40-0.9.41.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote_item', 'base_cost', [ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php index 09d522bf4e3..a9b04a4f446 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.41-0.9.42.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php index 704d4c6ac34..365d86573ad 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.42-0.9.43.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $this->startSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php index fb3c7e8ff40..515adbdb0b7 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.43-0.9.44.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->addColumn($installer->getTable('sales_order'), 'protect_code', 'VARCHAR( 6 ) NULL DEFAULT NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php index c21a99a3494..9ffcf72a41e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.44-0.9.45.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php index a521e6af4e3..3e04653f814 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.45-0.9.46.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $this->startSetup(); $orderEntityType = $installer->getEntityType('order'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php index b4607296bb1..1a594cb297b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.46-0.9.47.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $this->startSetup(); $orderEntityType = $installer->getEntityType('order'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php index cde59c5047c..dd2c168d8cb 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.47-0.9.48.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $this->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php index 0a89e8ab98a..be92c36099e 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.48-0.9.49.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $this->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php index cdd2f281153..42ca144ad9b 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.49-0.9.50.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php index 14a12fb400a..896493e48c8 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.5-0.9.6.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE `{$installer->getTable('sales_flat_quote_address_item')}` diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php index 1c096391ea2..e2c15365add 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->addAttribute('order_payment', 'additional_information', ['type' => 'text']); $installer->addAttribute('quote_payment', 'additional_information', ['type' => 'text']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php index 37674811c0f..b04412cf44a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.51-0.9.52.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $tableOrder = $this->getTable('sales_order'); $tableOrderItem = $this->getTable('sales_flat_order_item'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php index 80e9f5583b8..394a9c12681 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.52-0.9.53.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('quote', 'customer_gender', ['type' => 'int', 'visible' => false]); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php index b0f139314d7..a30494189bc 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.53-0.9.54.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $this->startSetup(); $installer->getConnection()->addColumn( diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php index f411b2fb5fe..a8ae578702a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.54-0.9.55.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('order_payment', 'base_amount_paid_online', ['type' => 'decimal']); $installer->addAttribute('order_payment', 'base_amount_refunded_online', ['type' => 'decimal']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php index 94b8c40d370..3c10597bc0f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.55-0.9.56.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; - /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); $installer->updateAttribute('order', 'customer_dob', 'backend_model', ''); $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php index 9128169703e..48376f1831a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.6-0.9.7.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('quote_item', 'base_tax_before_discount', ['type'=>'decimal']); $installer->addAttribute('quote_item', 'tax_before_discount', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php index 0c3eaa9c49e..8a501c57371 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.7-0.9.8.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->run(" ALTER TABLE `{$installer->getTable('sales_order_tax')}` ADD `base_amount` DECIMAL( 12, 4 ) NOT NULL, ADD `process` SMALLINT NOT NULL; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php index 6aa3b078f45..114892376f3 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.8-0.9.9.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->addAttribute('invoice', 'store_id', ['type'=>'static']); $installer->addAttribute('creditmemo', 'store_id', ['type'=>'static']); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php index 53aecb46588..05489274f46 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.9-0.9.10.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; // add FK constraint on products to flat quote items diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php index 270d2324143..feadeeec6a4 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.3.99-1.4.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index a64dabeda9a..f7f29164799 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_flat_order_grid'), 'updated_at', 'datetime default NULL'); $installer->getConnection()->addKey($installer->getTable('sales_flat_order_grid'), 'IDX_UPDATED_AT', 'updated_at'); $installer->run(" diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index 72f54f962af..9eaad9b8703 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -7,21 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addKey($installer->getTable('sales_flat_order'), 'IDX_UPDATED_AT', 'updated_at'); - $installer->getConnection()->addKey($installer->getTable('sales_flat_shipment'), 'IDX_CREATED_AT', 'created_at'); $installer->getConnection()->addKey($installer->getTable('sales_flat_shipment'), 'IDX_UPDATED_AT', 'updated_at'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php index 182bfec9498..1975141bee2 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.15-1.4.0.16.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'), 'tax_canceled', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($installer->getTable('sales/order_item'), 'hidden_tax_canceled', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($installer->getTable('sales/order_item'), 'tax_refunded', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php index 28d48f551de..f62d5d2d34f 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.16-1.4.0.17.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.17-1.4.0.18.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php index 06360a3dfac..5571d7dc38d 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.17-1.4.0.18.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/invoice_comment'), 'is_visible_on_front', @@ -37,4 +38,5 @@ 'is_visible_on_front', 'tinyint(1) unsigned not null default 0 after `is_customer_notified`' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php index 200d68fde07..77306eb8030 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.18-1.4.0.19.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.19-1.4.0.20.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php index 0ede07e62fa..e07eff90c83 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.19-1.4.0.20.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.2-1.4.0.3.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php index 4b935f7c403..c7854542c58 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.2-1.4.0.3.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'), 'hidden_tax_amount', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($installer->getTable('sales/order'), 'base_hidden_tax_amount', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($installer->getTable('sales/order'), 'shipping_hidden_tax_amount', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php index e259ee5a42f..49052677014 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.20-1.4.0.21.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.21-1.4.0.22.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php index 5c666785e5f..d2a08f51811 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.21-1.4.0.22.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.22-1.4.0.23.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php index 6d9339f0fc5..aa068c25d59 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.22-1.4.0.23.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.23-1.4.0.24.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php index bacdc3cbfc0..e6a9c932b33 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.23-1.4.0.24.php @@ -7,16 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php index fba5c7b4d1d..b48aee109cc 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.24-1.4.0.25.php @@ -7,16 +7,18 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Sales_Model_Entity_Setup $installer */ $installer = $this; diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php index e51210863de..809c55c452a 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.3-1.4.0.4.php @@ -7,22 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addKey($installer->getTable('sales/order_item'), 'IDX_PRODUCT_ID', 'product_id'); - foreach (['daily', 'monthly', 'yearly'] as $frequency) { $tableName = $installer->getTable('sales/bestsellers_aggregated_' . $frequency); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php index aed528674fc..699c0844650 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.4-1.4.0.5.php @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'), 'shipping_incl_tax', 'decimal(12,4) NULL'); $installer->getConnection()->addColumn($installer->getTable('sales/order'), 'base_shipping_incl_tax', 'decimal(12,4) NULL'); diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php index c524d499a37..487497ff124 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.5-1.4.0.6.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.6-1.4.0.7.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php index 453b1b2b412..b1517ffabb6 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.6-1.4.0.7.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.7-1.4.0.8.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php index 091ca3efff3..1128d9525af 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.7-1.4.0.8.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.4.0.8-1.4.0.15.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php index 8c095ce3e66..e7dbb1c35dd 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.4.0.8-1.4.0.15.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 5f9db847c54..784e4599165 100644 --- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.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..fa3865b8d92 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..0afbfe39366 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 @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.10-1.6.0.11.php b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.10-1.6.0.11.php new file mode 100644 index 00000000000..ca314f2285b --- /dev/null +++ b/app/code/core/Mage/Sales/sql/sales_setup/upgrade-1.6.0.10-1.6.0.11.php @@ -0,0 +1,41 @@ +startSetup(); + +// Add index to sales_flat_order on customer_email for fast lookup, only first 15 bytes +$keyList = $installer->getConnection()->getIndexList($installer->getTable('sales/order')); +if (!isset($keyList['IDX_SALES_FLAT_ORDER_CUSTOMER_EMAIL'])) { + $installer->run(" + ALTER TABLE {$installer->getTable('sales/order')} + ADD INDEX `IDX_SALES_FLAT_ORDER_CUSTOMER_EMAIL` (`customer_email` (15)); + "); +} + +// Add index to sales_flat_order_item.product_id for fast join/lookup +$this->getConnection()->addIndex( + $installer->getTable('sales/order_item'), + 'IDX_SALES_FLAT_ORDER_ITEM_PRODUCT_ID', + ['product_id'] +); + +$installer->endSetup(); 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..17180466583 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..aa6e762c9a9 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 @@ -7,23 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Create aggregation tables for updated_at fields + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..61f0afa0829 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..253744cb2f4 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..3c26c828f45 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c03bc9d8280 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..4758cfc167e 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 @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..39b1f65672c 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 @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sales + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Exception.php b/app/code/core/Mage/SalesRule/Exception.php index 7b4badced98..915ff75ee20 100644 --- a/app/code/core/Mage/SalesRule/Exception.php +++ b/app/code/core/Mage/SalesRule/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Helper/Coupon.php b/app/code/core/Mage/SalesRule/Helper/Coupon.php index e992518e4b0..f55e8e8146d 100644 --- a/app/code/core/Mage/SalesRule/Helper/Coupon.php +++ b/app/code/core/Mage/SalesRule/Helper/Coupon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -54,6 +55,8 @@ class Mage_SalesRule_Helper_Coupon extends Mage_Core_Helper_Abstract const XML_CHARSET_NODE = 'global/salesrule/coupon/charset/%s'; const XML_CHARSET_SEPARATOR = 'global/salesrule/coupon/separator'; + protected $_moduleName = 'Mage_SalesRule'; + /** * Get all possible coupon codes formats * @@ -122,7 +125,7 @@ public function getDefaultDashInterval() * Get Coupon's alphabet as array of chars * * @param string $format - * @return array|bool + * @return array */ public function getCharset($format) { diff --git a/app/code/core/Mage/SalesRule/Helper/Data.php b/app/code/core/Mage/SalesRule/Helper/Data.php index c594dcbcb3a..316a1e01293 100644 --- a/app/code/core/Mage/SalesRule/Helper/Data.php +++ b/app/code/core/Mage/SalesRule/Helper/Data.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_SalesRule'; + /** * Set store and base price which will be used during discount calculation to item object * diff --git a/app/code/core/Mage/SalesRule/Model/Coupon.php b/app/code/core/Mage/SalesRule/Model/Coupon.php index bf96a29e242..3c5b9e0bfa4 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php b/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php index 433b4e92dd0..5d3d3e8379d 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon/Codegenerator.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php b/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php index 152af51376f..6b2598a251e 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon/CodegeneratorInterface.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php b/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php index c7e19daeb9f..99a05a599f4 100644 --- a/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php +++ b/app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SalesRule Mass Coupon Generator * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + * * @method Mage_SalesRule_Model_Resource_Coupon getResource() * * @method string getDash() @@ -36,10 +41,6 @@ * @method string getToDate() * @method int getUsesPerCoupon() * @method int getUsesPerCustomer() - * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team */ class Mage_SalesRule_Model_Coupon_Massgenerator extends Mage_Core_Model_Abstract implements Mage_SalesRule_Model_Coupon_CodegeneratorInterface { diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php index dcfb87f4ca7..31fe332d8ca 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php index 5f1c605cbf5..e5681290cae 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..533ab22c948 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Coupon/Usage.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Report/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php index 3ba1e492167..88ea83b2725 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php index e240060e97f..664793545bd 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Rule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rule report 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_Report_Rule extends Mage_SalesRule_Model_Resource_Report_Rule diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php index a1fac0da502..3737171a47f 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Report/Updatedat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php index b9249a6341e..bc25c82e408 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule.php @@ -7,26 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SalesRule 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_Rule extends Mage_SalesRule_Model_Resource_Rule { - } diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php index a833992666a..c42af4c50c1 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php index 67c67d44d12..cf8a0e1e0d5 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php index 9f475b76372..a87feead772 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php index 9d7cfef2c46..3738d13a6f0 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SalesRule Mysql4 Rule Product 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_Rule_Product extends Mage_SalesRule_Model_Resource_Rule_Product diff --git a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php index 95119339c5c..bf9288bfc22 100644 --- a/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Mysql4/Rule/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php index e4eaf4cf17d..5dd238f0368 100644 --- a/app/code/core/Mage/SalesRule/Model/Observer.php +++ b/app/code/core/Mage/SalesRule/Model/Observer.php @@ -7,27 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SalesRule Model Observer * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Observer { - /** * Sales Rule Validator * @@ -67,7 +67,7 @@ public function sales_quote_address_discount_item($observer) * Registered callback: called after an order is placed * * @param Varien_Event_Observer $observer - * @return Mage_SalesRule_Model_Observer + * @return $this */ public function sales_order_afterPlace($observer) { @@ -124,6 +124,7 @@ public function sales_order_afterPlace($observer) } } } + return $this; } /** diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php index a19142da329..11be339650e 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php index 1123a86c2a6..453b24ce69d 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Freeshipping.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php index 21d014f0c75..9c6a820c405 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php index b8cff3c1a50..5ff769f944f 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,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..bb911c90635 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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..cf6b14b3a6f 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php index 3d6eeaa853a..e93d0ea4c02 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php index d4a7da3c97f..dc3d6ceffdd 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Rule report resource model * - * @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 extends Mage_Reports_Model_Resource_Report_Abstract { - /** - * Resource Report Rule constructor - * - */ protected function _construct() { $this->_setResource('salesrule'); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php index 6b41f645d17..223b4a4bc24 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..1f781f763a8 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 @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Report/Updatedat/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php index d60d6155cd8..6cafa747a7a 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Updatedat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php index 1d6f17b03de..d9ce3502049 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sales Rule resource model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Resource_Rule extends Mage_Rule_Model_Resource_Abstract { diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php index 25479c06318..c14f18b6bf1 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..4573f35afbb 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,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/Resource/Rule/Customer/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php index e9dec78e4f1..7072e97c40c 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php index 15414230fe1..e40916ebba7 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SalesRule Model Resource Rule_Product * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Resource_Rule_Product extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Constructor - * - */ protected function _construct() { $this->_init('salesrule/rule_product', 'product_rule_id'); diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php index fafc11c3428..6b83ac40620 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule.php b/app/code/core/Mage/SalesRule/Model/Rule.php index 09a8da50faf..49cd5790cf3 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule.php +++ b/app/code/core/Mage/SalesRule/Model/Rule.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping Cart Rule data model * + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + * * @method Mage_SalesRule_Model_Resource_Rule _getResource() * @method Mage_SalesRule_Model_Resource_Rule getResource() * @method Mage_SalesRule_Model_Resource_Rule_Collection getCollection() @@ -71,10 +76,6 @@ * @method int getRuleId() * @method bool hasStoreLabels() * @method $this setStoreLabels(array $value) - * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team */ class Mage_SalesRule_Model_Rule extends Mage_Rule_Model_Abstract { @@ -482,7 +483,7 @@ public function setIsValidForAddress($address, $validationResult) public function getIsValidForAddress($address) { $addressId = $this->_getAddressId($address); - return isset($this->_validatedAddresses[$addressId]) ? $this->_validatedAddresses[$addressId] : false; + return $this->_validatedAddresses[$addressId] ?? false; } /** diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php b/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php index 36f5711f235..87485a99c1d 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Action/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php index c7b186177a7..0f87d78e800 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Action/Product.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + */ class Mage_SalesRule_Model_Rule_Action_Product extends Mage_Rule_Model_Action_Abstract { /** diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php index a7007ba921d..33f02de46b4 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Address.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -52,7 +53,7 @@ public function loadAttributeOptions() } /** - * @return mixed + * @return Varien_Data_Form_Element_Abstract */ public function getAttributeElement() { diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php index ade8c2a0e7b..41f8b5286c1 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Combine.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php index 01daf5527c7..42dc2fd1fd8 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Product rule condition data model * - * @category Mage - * @package Mage_SalesRule - * @author Magento Core Team + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team */ class Mage_SalesRule_Model_Rule_Condition_Product extends Mage_Rule_Model_Condition_Product_Abstract { diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php index f3d33b7e4ff..8abf5aae996 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Attribute/Assigned.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php index 84e485699ee..23e69f830c3 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php index cd6e2daabb4..648ebc64005 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Found.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -65,7 +66,7 @@ public function asHtml() * validate * * @param Varien_Object $object Quote - * @return boolean + * @return bool */ public function validate(Varien_Object $object) { 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..2bdd90beb42 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 @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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) */ @@ -121,7 +126,7 @@ public function asHtml() * validate * * @param Varien_Object $object Quote - * @return boolean + * @return bool */ public function validate(Varien_Object $object) { diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php index b2a5518fda4..318fe2f50ab 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Customer.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Customer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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/Rule/Product.php b/app/code/core/Mage/SalesRule/Model/Rule/Product.php index 599b89cae2d..5f80e9730cf 100644 --- a/app/code/core/Mage/SalesRule/Model/Rule/Product.php +++ b/app/code/core/Mage/SalesRule/Model/Rule/Product.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_SalesRule + * @author Magento Core Team + */ class Mage_SalesRule_Model_Rule_Product extends Mage_Core_Model_Abstract { protected function _construct() diff --git a/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php b/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php index 3fe2268e6b7..00e090d9219 100644 --- a/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php +++ b/app/code/core/Mage/SalesRule/Model/System/Config/Source/Coupon/Format.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index eeb853ea4ff..f2a34dc6143 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -544,7 +545,9 @@ public function processWeeeAmount(Mage_Sales_Model_Quote_Address $address, $item /** * for calculating weee tax discount */ + /** @var Mage_Tax_Model_Config $config */ $config = $this->_getSingleton('tax/config'); + /** @var Mage_Tax_Model_Calculation $calculator */ $calculator = $this->_getSingleton('tax/calculation'); $request = $calculator->getRateRequest( $address, @@ -871,10 +874,7 @@ public function setCartFixedRuleUsedForAddress($ruleId, $itemId) */ public function getCartFixedRuleUsedForAddress($ruleId) { - if (isset($this->_cartFixedRuleUsedForAddress[$ruleId])) { - return $this->_cartFixedRuleUsedForAddress[$ruleId]; - } - return null; + return $this->_cartFixedRuleUsedForAddress[$ruleId] ?? null; } /** @@ -983,7 +983,7 @@ protected function _getItemPrice($item) { $price = $item->getDiscountCalculationPrice(); $calcPrice = $item->getCalculationPrice(); - return ($price !== null) ? $price : $calcPrice; + return $price ?? $calcPrice; } /** @@ -1062,7 +1062,7 @@ public function prepareDescription($address, $separator = ', ') * wrap Mage::getSingleton * * @param string $name - * @return mixed + * @return Mage_Core_Model_Abstract */ protected function _getSingleton($name) { diff --git a/app/code/core/Mage/SalesRule/etc/adminhtml.xml b/app/code/core/Mage/SalesRule/etc/adminhtml.xml index e739c53efc5..dfcc39fbb34 100644 --- a/app/code/core/Mage/SalesRule/etc/adminhtml.xml +++ b/app/code/core/Mage/SalesRule/etc/adminhtml.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. (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/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml index f2685048134..32ff6439044 100644 --- a/app/code/core/Mage/SalesRule/etc/config.xml +++ b/app/code/core/Mage/SalesRule/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..fa05fd38923 100644 --- a/app/code/core/Mage/SalesRule/etc/system.xml +++ b/app/code/core/Mage/SalesRule/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php index 8efc72172b5..8cb31c3adfd 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/install-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php index ac19fdc8bdf..54347eb345b 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php index 6cd1079b144..229838c9e6a 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-install-1.4.0.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php index 158b3abcd0b..944d8d9a46f 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php index 98b5df35d87..0cb8cee915c 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php index 376c56bd863..e9abbf0222f 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->startSetup(); /* @@ -55,7 +56,6 @@ $installer->updateAttribute($orderEntityTypeId, $attribute['attribute_code'], array('backend_type' => 'static')); $installer->getConnection()->commit(); - } catch (Exception $e) { $installer->getConnection()->rollback(); $installer->getConnection()->dropColumn($this->getTable('sales/order'), $attribute['attribute_code']); diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php index a7d2cdfc305..7db89e66516 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -7,25 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * @deprecated since 1.4 field already changed to varchar 255 default null in sales upgrade to 1.4 - */ - -$installer = $this; -/** @var Mage_Sales_Model_Resource_Setup $installer */ -$installer->startSetup(); - -// $installer->getConnection()->changeColumn($this->getTable('sales_order'), 'coupon_code', 'coupon_code', 'varchar(255) DEFAULT NULL'); - -$installer->endSetup(); + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + */ \ No newline at end of file diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php index 95125cf619e..8ecedfcb06c 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php index a21b9663d3f..15707593c69 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php index fa007d41916..816e4cf7f79 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php index 8b7b3fbc77a..da48049f3c4 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php index 6a4c1009535..a10675bd929 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php index 5367867f8f7..e26ecc5ddc4 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php index c7361a13e59..9123f4ea720 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php index fc84f957e72..a23a11e38dc 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,13 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php index 1f12ca4861c..215c9a8061b 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; + +/** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$connection = $installer->getConnection(); $tableSalesrule = $installer->getTable('salesrule/rule'); $tableSalesruleCustomer = $installer->getTable('salesrule/rule_customer'); @@ -27,9 +31,6 @@ $tableSalesruleCouponUsage = $installer->getTable('salesrule/coupon_usage'); $tableCustomerEntity = $installer->getTable('customer/entity'); -$connection = $installer->getConnection(); -/** @var Varien_Db_Adapter_Pdo_Mysql $connection */ - $installer->run(" CREATE TABLE `{$tableSalesruleCoupon}` ( `coupon_id` int(10) unsigned NOT NULL AUTO_INCREMENT, diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php index 1620bba152c..089c00b938d 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php @@ -7,26 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - -$tableSalesrule = $installer->getTable('salesrule/rule'); -$tableSalesruleCoupon = $installer->getTable('salesrule/coupon'); +$installer = $this; $connection = $installer->getConnection(); /** @var Varien_Db_Adapter_Pdo_Mysql $connection */ +$tableSalesrule = $installer->getTable('salesrule/rule'); +$tableSalesruleCoupon = $installer->getTable('salesrule/coupon'); + $connection->addColumn( $tableSalesrule, 'coupon_type', diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php index 1c9afc96cad..5fd20fd0cf5 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection() diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php index e2ecacbf0fe..4506720763d 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sales_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->addColumn( $installer->getTable('salesrule/coupon_aggregated'), diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php index df70c9284da..470b24c9dd9 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php index b661d68be3d..c3ef83dbf8f 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sales_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 26bee5c527d..d072af47f13 100644 --- a/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/SalesRule/sql/salesrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/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..86fd5b258b2 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 @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..cf107b2d54c 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 @@ -7,20 +7,19 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..25e94b50c00 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_SalesRule + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Block/Send.php b/app/code/core/Mage/Sendfriend/Block/Send.php index 4cf60b881b1..28b0b3c5f94 100644 --- a/app/code/core/Mage/Sendfriend/Block/Send.php +++ b/app/code/core/Mage/Sendfriend/Block/Send.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Email to a Friend Block * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team */ class Mage_Sendfriend_Block_Send extends Mage_Core_Block_Template { @@ -184,7 +185,7 @@ protected function _getSendfriendModel() /** * Check if user is allowed to send * - * @return boolean + * @return bool */ public function canSend() { diff --git a/app/code/core/Mage/Sendfriend/Helper/Data.php b/app/code/core/Mage/Sendfriend/Helper/Data.php index c6944615d95..70fba32c75e 100644 --- a/app/code/core/Mage/Sendfriend/Helper/Data.php +++ b/app/code/core/Mage/Sendfriend/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -22,7 +23,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 @@ -39,6 +40,8 @@ class Mage_Sendfriend_Helper_Data extends Mage_Core_Helper_Abstract const CHECK_IP = 1; const CHECK_COOKIE = 0; + protected $_moduleName = 'Mage_Sendfriend'; + /** * Check is enabled Module * diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php index 8991a617c09..d6b551f7efe 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SendFriend Log Resource 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_Sendfriend extends Mage_Sendfriend_Model_Resource_Sendfriend diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php index 0ead1d78183..2dd4b347c79 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Sendfriend/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php index 05361fc8d0c..88c098fcef2 100644 --- a/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Sendfriend/Model/Observer.php index 6ee13aae38c..556bd606fb0 100644 --- a/app/code/core/Mage/Sendfriend/Model/Observer.php +++ b/app/code/core/Mage/Sendfriend/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sendfriend Observer * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team */ class Mage_Sendfriend_Model_Observer { diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php index 8becaf95af2..442a06f8d98 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SendFriend Log Resource Model * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team */ 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/Sendfriend/Collection.php b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php index 29a112bba9d..101500780ff 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Sendfriend/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php index 1807661e3e6..e7e59fc834a 100644 --- a/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php +++ b/app/code/core/Mage/Sendfriend/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Model/Sendfriend.php b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php index d9c8daae4fd..1bc68e36270 100644 --- a/app/code/core/Mage/Sendfriend/Model/Sendfriend.php +++ b/app/code/core/Mage/Sendfriend/Model/Sendfriend.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * SendFriend Log * + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team + * * @method Mage_Sendfriend_Model_Resource_Sendfriend _getResource() * @method Mage_Sendfriend_Model_Resource_Sendfriend getResource() * @method Mage_Sendfriend_Model_Resource_Sendfriend_Collection getCollection() @@ -29,10 +34,6 @@ * @method $this setIp(int $value) * @method int getTime() * @method $this setTime(int $value) - * - * @category Mage - * @package Mage_Sendfriend - * @author Magento Core Team */ class Mage_Sendfriend_Model_Sendfriend extends Mage_Core_Model_Abstract { @@ -78,10 +79,6 @@ class Mage_Sendfriend_Model_Sendfriend extends Mage_Core_Model_Abstract */ protected $_lastCookieValue = []; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_init('sendfriend/sendfriend'); @@ -416,7 +413,7 @@ public function getSendCount($ip = null, $startTime = null) /** * Get max allowed uses of "Send to Friend" function per hour * - * @return integer + * @return int */ public function getMaxSendsToFriend() { @@ -436,7 +433,7 @@ public function getTemplate() /** * Get max allowed recipients for "Send to a Friend" function * - * @return integer + * @return int */ public function getMaxRecipients() { @@ -446,7 +443,7 @@ public function getMaxRecipients() /** * Check if user is allowed to email product to a friend * - * @return boolean + * @return bool */ public function canEmailToFriend() { @@ -456,7 +453,7 @@ public function canEmailToFriend() /** * Check if user is exceed limit * - * @return boolean + * @return bool */ public function isExceedLimit() { @@ -514,11 +511,7 @@ protected function _sentCountByCookies($increment = false) $time = time(); $newTimes = []; - if (isset($this->_lastCookieValue[$cookie])) { - $oldTimes = $this->_lastCookieValue[$cookie]; - } else { - $oldTimes = $this->getCookie()->get($cookie); - } + $oldTimes = $this->_lastCookieValue[$cookie] ?? $this->getCookie()->get($cookie); if ($oldTimes) { $oldTimes = explode(',', $oldTimes); diff --git a/app/code/core/Mage/Sendfriend/controllers/ProductController.php b/app/code/core/Mage/Sendfriend/controllers/ProductController.php index 22b5f79246f..fd61076e2d2 100644 --- a/app/code/core/Mage/Sendfriend/controllers/ProductController.php +++ b/app/code/core/Mage/Sendfriend/controllers/ProductController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Email to a Friend Product Controller * - * @category Mage - * @package Mage_Sedfriend - * @author Magento Core Team + * @category Mage + * @package Mage_Sendfriend + * @author Magento Core Team */ class Mage_Sendfriend_ProductController extends Mage_Core_Controller_Front_Action { diff --git a/app/code/core/Mage/Sendfriend/etc/config.xml b/app/code/core/Mage/Sendfriend/etc/config.xml index 58841fe1d02..9e8a62f401b 100644 --- a/app/code/core/Mage/Sendfriend/etc/config.xml +++ b/app/code/core/Mage/Sendfriend/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2019 The OpenMage Contributors (https://www.openmage.org) + * @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..90e903c2d85 100644 --- a/app/code/core/Mage/Sendfriend/etc/system.xml +++ b/app/code/core/Mage/Sendfriend/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php index 6b57061be08..5b9e8883364 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/install-1.6.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $table = $installer->getConnection() diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php index 9fb9b8f8b9b..5d78cbd60c7 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php index 4301408344b..19ae7e5ec22 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php index a5561ae9836..11de9db3608 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->dropKey($installer->getTable('sendfriend/sendfriend'), 'ip'); $installer->getConnection()->dropKey($installer->getTable('sendfriend/sendfriend'), 'time'); $installer->getConnection()->modifyColumn( diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php index 1358d08c07c..fab55f06f0b 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); + $installer->getConnection()->modifyColumn( $installer->getTable('sendfriend/sendfriend'), 'log_id', @@ -32,4 +33,5 @@ 'website_id', 'smallint(5) NOT NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 20a0d8c7370..12041215c64 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php index e2652f33d4f..45990b1654e 100644 --- a/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +++ b/app/code/core/Mage/Sendfriend/sql/sendfriend_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sendfriend + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Sendfriend_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php b/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php index 5e62ae089c8..1c043abfb50 100644 --- a/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php +++ b/app/code/core/Mage/Shipping/Block/Tracking/Ajax.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php index 929e92963b7..abf34518557 100644 --- a/app/code/core/Mage/Shipping/Block/Tracking/Popup.php +++ b/app/code/core/Mage/Shipping/Block/Tracking/Popup.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Shipping_Block_Tracking_Popup * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method string getProtectCode() */ class Mage_Shipping_Block_Tracking_Popup extends Mage_Core_Block_Template @@ -251,7 +256,7 @@ public function formatDeliveryTime($time, $date = null) /** * Is 'contact us' option enabled? * - * @return boolean + * @return bool */ public function getContactUsEnabled() { diff --git a/app/code/core/Mage/Shipping/Exception.php b/app/code/core/Mage/Shipping/Exception.php index 3adb607520c..0823e254539 100644 --- a/app/code/core/Mage/Shipping/Exception.php +++ b/app/code/core/Mage/Shipping/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Helper/Data.php b/app/code/core/Mage/Shipping/Helper/Data.php index db67c44df6f..98c90b50b41 100644 --- a/app/code/core/Mage/Shipping/Helper/Data.php +++ b/app/code/core/Mage/Shipping/Helper/Data.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Shipping'; + /** * Allowed hash keys * @@ -53,7 +56,7 @@ public function decodeTrackingHash($hash) * @deprecated the non-model usage * * @param string $key - * @param integer|Mage_Sales_Model_Order|Mage_Sales_Model_Order_Shipment|Mage_Sales_Model_Order_Shipment_Track $model + * @param int|Mage_Sales_Model_Order|Mage_Sales_Model_Order_Shipment|Mage_Sales_Model_Order_Shipment_Track $model * @param string $method - option * @return string */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php index 4281d5f478b..2c13a54bf7b 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -93,6 +94,20 @@ abstract class Mage_Shipping_Model_Carrier_Abstract extends Varien_Object */ protected $_debugReplacePrivateDataKeys = []; + /** + * Raw rate request data + * + * @var Varien_Object|null + */ + protected $_rawRequest; + + /** + * Rate result data + * + * @var Mage_Shipping_Model_Rate_Result|null + */ + protected $_result; + /** * Retrieve information from carrier configuration * @@ -282,7 +297,7 @@ public function checkAvailableShipCountries(Mage_Shipping_Model_Rate_Request $re * Processing additional validation to check is carrier applicable. * * @param Mage_Shipping_Model_Rate_Request $request - * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|boolean + * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool */ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request) { @@ -313,7 +328,7 @@ public function isFixed() /** * Check if carrier has shipping tracking option available * - * @return boolean + * @return bool */ public function isTrackingAvailable() { @@ -323,7 +338,7 @@ public function isTrackingAvailable() /** * Check if carrier has shipping label option available * - * @return boolean + * @return bool */ public function isShippingLabelsAvailable() { @@ -520,7 +535,7 @@ public function isStateProvinceRequired() /** * Check if city option required * - * @return boolean + * @return bool */ public function isCityRequired() { diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php index 7096aabe620..e8ec7e862e9 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Flatrate.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php index 9ada6e4cc6f..53376e1af96 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Interface.php b/app/code/core/Mage/Shipping/Model/Carrier/Interface.php index 723d2d0958d..0401fc13821 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Interface.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Interface.php @@ -7,24 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + */ interface Mage_Shipping_Model_Carrier_Interface { - /** * Check if carrier has shipping tracking option available * - * @return boolean + * @return bool */ public function isTrackingAvailable(); diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php index f94864fcbd1..00fb8048ce4 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Pickup.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Carrier_Pickup extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface { - protected $_code = 'pickup'; protected $_isFixed = true; diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index 7d65ec64cd2..8ce84a34250 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -7,23 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 * @@ -32,9 +36,7 @@ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_ protected $_code = 'tablerate'; /** - * boolean isFixed - * - * @var boolean + * @var bool */ protected $_isFixed = true; @@ -52,9 +54,6 @@ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_ */ protected $_conditionNames = []; - /** - * Constructor - */ public function __construct() { parent::__construct(); @@ -67,7 +66,7 @@ public function __construct() * Collect and get rates * * @param Mage_Shipping_Model_Rate_Request $request - * @return bool|Mage_Core_Model_Abstract + * @return false|Mage_Shipping_Model_Rate_Result */ public function collectRates(Mage_Shipping_Model_Rate_Request $request) { @@ -134,6 +133,7 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) $request->setPackageWeight($request->getFreeMethodWeight()); $request->setPackageQty($oldQty - $freeQty); + /** @var Mage_Shipping_Model_Rate_Result $result */ $result = $this->_getModel('shipping/rate_result'); $rate = $this->getRate($request); @@ -198,7 +198,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) * Get Model * * @param string $modelName - * * @return Mage_Core_Model_Abstract */ protected function _getModel($modelName) @@ -210,7 +209,6 @@ protected function _getModel($modelName) * Get Rate * * @param Mage_Shipping_Model_Rate_Request $request - * * @return Mage_Core_Model_Abstract */ public function getRate(Mage_Shipping_Model_Rate_Request $request) @@ -223,8 +221,7 @@ public function getRate(Mage_Shipping_Model_Rate_Request $request) * * @param string $type * @param string $code - * - * @return array + * @return array|string */ public function getCode($type, $code = '') { diff --git a/app/code/core/Mage/Shipping/Model/Config.php b/app/code/core/Mage/Shipping/Model/Config.php index 9f53690020e..3f81cb29347 100644 --- a/app/code/core/Mage/Shipping/Model/Config.php +++ b/app/code/core/Mage/Shipping/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Info.php b/app/code/core/Mage/Shipping/Model/Info.php index 5e6e8ab6886..a34e58b1d81 100644 --- a/app/code/core/Mage/Shipping/Model/Info.php +++ b/app/code/core/Mage/Shipping/Model/Info.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..ec071fcf629 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php index cf79e01af89..e1f7d0c09bd 100644 --- a/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php +++ b/app/code/core/Mage/Shipping/Model/Mysql4/Carrier/Tablerate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Abstract.php index e7e35a4e3d9..4fbb9d00513 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Request.php b/app/code/core/Mage/Shipping/Model/Rate/Request.php index 090e2642d82..2d5761bb9c9 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Request.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Request.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -50,6 +51,10 @@ * - container: CP * - address: RES * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method Mage_Sales_Model_Quote_Item[] getAllItems() * @method $this setAllItems(array $items) * @@ -76,8 +81,8 @@ * @method string getDestStreet() * @method $this setDestStreet(string $value) * - * @method boolean getFreeShipping() - * @method $this setFreeShipping(boolean $flag) + * @method bool getFreeShipping() + * @method $this setFreeShipping(bool $flag) * @method float getFreeMethodWeight() * @method $this setFreeMethodWeight(float $value) * @@ -86,8 +91,8 @@ * @method string getLimitMethod() * @method $this setLimitMethod(string $value) * - * @method boolean getOptionInsurance() - * @method $this setOptionInsurance(boolean $value) + * @method bool getOptionInsurance() + * @method $this setOptionInsurance(bool $value) * @method float getOptionHandling() * @method $this setOptionHandling(float $flag) * @method float getOrderTotalQty() @@ -131,12 +136,7 @@ * * @method int getWebsiteId() * @method $this setWebsiteId(int $value) - * - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team */ class Mage_Shipping_Model_Rate_Request extends Varien_Object { - } diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php index c4b1951a7dd..fb2af72976b 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Rate_Result { /** @@ -58,7 +64,7 @@ public function setError($error) /** * Get Error * - * @return null|bool; + * @return null|bool */ public function getError() { @@ -105,7 +111,7 @@ public function getAllRates() */ public function getRateById($id) { - return isset($this->_rates[$id]) ? $this->_rates[$id] : null; + return $this->_rates[$id] ?? null; } /** diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php index 6ce9f39c394..419154ea08f 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php index d5472afa90a..d38308a5ef1 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Error.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php index ceb446edcea..a35517105ac 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result/Method.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,6 +28,10 @@ * - price: $9.40 (cost+handling) * - cost: $8.00 * + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method $this setCarrier(string $value) * @method $this setCarrierTitle(string $value) * @method string getMethod() 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..f14bfa4237c 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -91,9 +92,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'); @@ -103,7 +101,7 @@ protected function _construct() * Return table rate array or false by rate request * * @param Mage_Shipping_Model_Rate_Request $request - * @return array|boolean + * @return array|bool */ public function getRate(Mage_Shipping_Model_Rate_Request $request) { diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php index 5741d17a17f..6e9dd044a0f 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Shipment/Request.php b/app/code/core/Mage/Shipping/Model/Shipment/Request.php index 94f2a337ea8..5d25addde99 100644 --- a/app/code/core/Mage/Shipping/Model/Shipment/Request.php +++ b/app/code/core/Mage/Shipping/Model/Shipment/Request.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method $this setOrderShipment(Mage_Sales_Model_Order_Shipment $orderShipment) * @method Mage_Sales_Model_Order_Shipment getOrderShipment() * @@ -80,10 +85,6 @@ * @method $this setShipperEmail(string $value) * @method $this setBaseCurrencyCode(string $value) * @method $this setStoreId(int $value) - * - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team */ class Mage_Shipping_Model_Shipment_Request extends Varien_Object { diff --git a/app/code/core/Mage/Shipping/Model/Shipment/Return.php b/app/code/core/Mage/Shipping/Model/Shipment/Return.php index 9936c94d0af..6125b147e6b 100644 --- a/app/code/core/Mage/Shipping/Model/Shipment/Return.php +++ b/app/code/core/Mage/Shipping/Model/Shipment/Return.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + * * @method Mage_Shipping_Model_Shipment_Request setOrderShipment(Mage_Sales_Model_Order_Shipment $orderShipment) * @method Mage_Sales_Model_Order_Shipment getOrderShipment() * @method Mage_Shipping_Model_Shipment_Request setShipperContactPersonName(string $value) @@ -73,10 +78,6 @@ * @method string getShippingMethod() * @method Mage_Shipping_Model_Shipment_Request setPackageWeight(float $value) * @method float getPackageWeight() - * - * @category Mage - * @package Mage_Shipping - * @author Magento Core Team */ class Mage_Shipping_Model_Shipment_Return extends Varien_Object { diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php index a63b9b53a2c..4461bf5ad38 100644 --- a/app/code/core/Mage/Shipping/Model/Shipping.php +++ b/app/code/core/Mage/Shipping/Model/Shipping.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Source/HandlingAction.php b/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php index 2af4241cb3f..27ecac5e4f8 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingAction.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php index 4e5fccfeda7..74930894ddd 100644 --- a/app/code/core/Mage/Shipping/Model/Source/HandlingType.php +++ b/app/code/core/Mage/Shipping/Model/Source/HandlingType.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result.php b/app/code/core/Mage/Shipping/Model/Tracking/Result.php index 72b5a483f99..2257537e980 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Shipping + * @author Magento Core Team + */ class Mage_Shipping_Model_Tracking_Result { protected $_trackings = []; diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php index b12bb54ae7b..27603534cc7 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php index 1cc8d8fe27f..465497fe93f 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Error.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..9f3556f165b 100644 --- a/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php +++ b/app/code/core/Mage/Shipping/Model/Tracking/Result/Status.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -38,6 +39,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 deleted file mode 100644 index 51f00a5b1c1..00000000000 --- a/app/code/core/Mage/Shipping/controllers/ShippingController.php +++ /dev/null @@ -1,35 +0,0 @@ -getRequest()->getPost(); - $this->loadLayout(); - $this->renderLayout(); - } -} diff --git a/app/code/core/Mage/Shipping/controllers/TrackingController.php b/app/code/core/Mage/Shipping/controllers/TrackingController.php index fe2abf00d31..c104d63e4c2 100644 --- a/app/code/core/Mage/Shipping/controllers/TrackingController.php +++ b/app/code/core/Mage/Shipping/controllers/TrackingController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,15 +24,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 bf41c983e4d..7e15b653db4 100644 --- a/app/code/core/Mage/Shipping/etc/adminhtml.xml +++ b/app/code/core/Mage/Shipping/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 cc4ed3cb820..7b810e7e715 100644 --- a/app/code/core/Mage/Shipping/etc/config.xml +++ b/app/code/core/Mage/Shipping/etc/config.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. (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/Shipping/etc/system.xml b/app/code/core/Mage/Shipping/etc/system.xml index 87688afdde9..26aafcf8184 100644 --- a/app/code/core/Mage/Shipping/etc/system.xml +++ b/app/code/core/Mage/Shipping/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php index 0e94e148c1f..09f7b042f24 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/install-1.6.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php index 440fddff93f..f2872bea553 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 36cf69b0c55..af1ff6c114a 100644 --- a/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Shipping/sql/shipping_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Shipping + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sitemap/Helper/Data.php b/app/code/core/Mage/Sitemap/Helper/Data.php index 5e56bd7f2ec..1a5334172ae 100644 --- a/app/code/core/Mage/Sitemap/Helper/Data.php +++ b/app/code/core/Mage/Sitemap/Helper/Data.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Sitemap'; } diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php index 88e8ad24e97..cd04e0c59cb 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php index 885dda2bfec..363ffd99753 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Catalog/Product.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sitemap resource product collection 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_Catalog_Product extends Mage_Sitemap_Model_Resource_Catalog_Product diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php index 1c0af31d023..e149ee0e862 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Cms/Page.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sitemap cms page collection 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_Cms_Page extends Mage_Sitemap_Model_Resource_Cms_Page diff --git a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php index 55359638e43..01b988d1339 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php index 0a8f9d3aacf..535ebbce266 100644 --- a/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php +++ b/app/code/core/Mage/Sitemap/Model/Mysql4/Sitemap/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Observer.php b/app/code/core/Mage/Sitemap/Model/Observer.php index 8433f4c4877..51c1ee2ed5e 100644 --- a/app/code/core/Mage/Sitemap/Model/Observer.php +++ b/app/code/core/Mage/Sitemap/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Sitemap - * @author Magento Core Team + * @author Magento Core Team */ class Mage_Sitemap_Model_Observer { - /** * Enable/disable configuration */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php index 187b77059db..5651bdb88cd 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php index c7939660225..8cbd7fcc92f 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Category.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php index 493e59f53d1..90f9ffe4f46 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Product.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sitemap resource product collection model * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team */ class Mage_Sitemap_Model_Resource_Catalog_Product extends Mage_Sitemap_Model_Resource_Catalog_Abstract { - /** - * Init resource model (catalog/product) - */ protected function _construct() { $this->_init('catalog/product', 'entity_id'); diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php index dd96fa128de..908c4d34b29 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Cms/Page.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Sitemap cms page collection model * - * @category Mage - * @package Mage_Sitemap - * @author Magento Core Team + * @category Mage + * @package Mage_Sitemap + * @author Magento Core Team */ class Mage_Sitemap_Model_Resource_Cms_Page extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Init resource model (catalog/category) - * - */ protected function _construct() { $this->_init('cms/page', 'page_id'); diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php index 6cc5299b00b..538134b90e3 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Resource/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php index 7b194a73ccd..9df56a9ce51 100644 --- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php +++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php index ecb04f7eca6..ce033f4a991 100644 --- a/app/code/core/Mage/Sitemap/Model/Sitemap.php +++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +41,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 { @@ -220,7 +221,9 @@ public function generateXml() $io->streamWrite(''); $io->streamClose(); - $this->setSitemapTime(Mage::getSingleton('core/date')->gmtDate('Y-m-d H:i:s')); + $this->setSitemapTime( + Mage::getSingleton('core/date')->gmtDate(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT) + ); $this->save(); return $this; diff --git a/app/code/core/Mage/Sitemap/etc/adminhtml.xml b/app/code/core/Mage/Sitemap/etc/adminhtml.xml index d7816b48425..054bb03bf37 100644 --- a/app/code/core/Mage/Sitemap/etc/adminhtml.xml +++ b/app/code/core/Mage/Sitemap/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 04aff246c36..f56b7bb7c82 100644 --- a/app/code/core/Mage/Sitemap/etc/config.xml +++ b/app/code/core/Mage/Sitemap/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..88310028cad 100644 --- a/app/code/core/Mage/Sitemap/etc/system.xml +++ b/app/code/core/Mage/Sitemap/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php index 8502be05a4c..8bb51272a87 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/install-1.6.0.0.php @@ -7,21 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php index 32b5bceab9f..dc6a4e3284a 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php index 806e6c395c5..18a92175c77 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php index c40065e0288..4e30956ef0e 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,16 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ - -$installer = $this; -/** @var Mage_Core_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 0fe601ed0bf..1635e961d7c 100644 --- a/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Sitemap/sql/sitemap_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Sitemap + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tag/Block/All.php b/app/code/core/Mage/Tag/Block/All.php index 8c40e90b0c7..1b90af5815c 100644 --- a/app/code/core/Mage/Tag/Block/All.php +++ b/app/code/core/Mage/Tag/Block/All.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Block/Customer/Recent.php b/app/code/core/Mage/Tag/Block/Customer/Recent.php index 643155a0fe9..8388d14beb4 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Recent.php +++ b/app/code/core/Mage/Tag/Block/Customer/Recent.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tags Customer Reviews Block * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team + * @category Mage + * @package Mage_Tag + * @author Magento Core Team */ - class Mage_Tag_Block_Customer_Recent extends Mage_Core_Block_Template { /** diff --git a/app/code/core/Mage/Tag/Block/Customer/Tags.php b/app/code/core/Mage/Tag/Block/Customer/Tags.php index ee3e4e77ade..5f485f89fb7 100644 --- a/app/code/core/Mage/Tag/Block/Customer/Tags.php +++ b/app/code/core/Mage/Tag/Block/Customer/Tags.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,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..b845629ed7a 100644 --- a/app/code/core/Mage/Tag/Block/Customer/View.php +++ b/app/code/core/Mage/Tag/Block/Customer/View.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tag/Block/Popular.php b/app/code/core/Mage/Tag/Block/Popular.php index e6419501dd7..a543f4fa667 100644 --- a/app/code/core/Mage/Tag/Block/Popular.php +++ b/app/code/core/Mage/Tag/Block/Popular.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Tag_Block_Popular extends Mage_Core_Block_Template { protected $_tags; diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php index 2223d6b8be3..74eb363e2e7 100644 --- a/app/code/core/Mage/Tag/Block/Product/List.php +++ b/app/code/core/Mage/Tag/Block/Product/List.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ +/** + * @category Mage + * @package Mage_Tag + * @author Magento Core Team + */ class Mage_Tag_Block_Product_List extends Mage_Core_Block_Template { protected $_collection; diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php index 6689f15bdcd..d13f015c4fb 100644 --- a/app/code/core/Mage/Tag/Block/Product/Result.php +++ b/app/code/core/Mage/Tag/Block/Product/Result.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,11 +24,10 @@ * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @author Magento Core Team * * @method $this setResultCount(int $value) */ - class Mage_Tag_Block_Product_Result extends Mage_Catalog_Block_Product_Abstract { /** @@ -99,10 +99,12 @@ protected function _getProductCollection() ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes()) ->addTagFilter($this->getTag()->getId()) ->addStoreFilter(Mage::app()->getStore()->getId()) + ->addAttributeToFilter('status', [ + 'in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds() + ]) ->addMinimalPrice() ->addUrlRewrite() ->setActiveFilter(); - Mage::getSingleton('catalog/product_status')->addSaleableFilterToCollection($this->_productCollection); Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection( $this->_productCollection ); diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php index 38e269cf85c..3008110cb2e 100644 --- a/app/code/core/Mage/Tag/Helper/Data.php +++ b/app/code/core/Mage/Tag/Helper/Data.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Tag'; + /** * @return array */ diff --git a/app/code/core/Mage/Tag/Model/Api.php b/app/code/core/Mage/Tag/Model/Api.php index 7ee7e40a86f..48bd095501e 100644 --- a/app/code/core/Mage/Tag/Model/Api.php +++ b/app/code/core/Mage/Tag/Model/Api.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Api/V2.php b/app/code/core/Mage/Tag/Model/Api/V2.php index 91f48f061e6..b69afdaaa58 100644 --- a/app/code/core/Mage/Tag/Model/Api/V2.php +++ b/app/code/core/Mage/Tag/Model/Api/V2.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php index dce74a896b6..116d6d7dd6b 100644 --- a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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..8e42d2318c2 100644 --- a/app/code/core/Mage/Tag/Model/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Indexer/Summary.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +44,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 +64,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/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php index 3dfd21a97af..987bac72984 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..8a2ce60ebbc 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Indexer/Summary.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php index 3afd86301cf..cb88464bdf4 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Popular/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php index 3568f4550d7..38d92dd5468 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php index 226a0c9b9d1..2c07206a1db 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php index 68272779374..3da9f2087a3 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php index 118f71628c3..8f86690bd46 100644 --- a/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Mysql4/Tag/Relation.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tag Relation 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_Relation extends Mage_Tag_Model_Resource_Tag_Relation diff --git a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php index 8f441c3444c..d0db8166543 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..8e8e2a5bf8d 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php +++ b/app/code/core/Mage/Tag/Model/Resource/Indexer/Summary.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php index 4b92c55f67a..95787ac5188 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php index 4755627e99a..67c91ead61c 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -420,7 +421,7 @@ protected function _afterLoad() /** * Render SQL for retrieve product count * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php index 3d57eded6d7..4d802c4ca9b 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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'); @@ -55,7 +52,7 @@ protected function _initUniqueFields() * * @param Mage_Tag_Model_Tag $model * @param string $name - * @return array|false + * @return false|void */ public function loadByName($model, $name) { @@ -70,7 +67,7 @@ public function loadByName($model, $name) ->where('name = :name'); $data = $read->fetchRow($select, ['name' => $name]); - $model->setData(( is_array($data) ) ? $data : []); + $model->setData(is_array($data) ? $data : []); } else { return false; } @@ -285,7 +282,7 @@ protected function _getGlobalAggregation($tagId) * * @deprecated after 1.4.0.0 * - * @param Mage_Tag_Model_Tag|Mage_Tag_Model_Tag $object + * @param Mage_Tag_Model_Tag $object * @return Mage_Tag_Model_Tag */ public function aggregate($object) diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php index 3abe71fa52d..0811dba31a5 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -278,7 +279,7 @@ public function addFieldToFilter($field, $condition = null) /** * Get sql for get record count * - * @return string + * @return Varien_Db_Select */ public function getSelectCountSql() { diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php index 58beeb8b6ea..513f57b6a98 100644 --- a/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Relation.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tag Relation 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_Relation extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Tag/Model/Session.php b/app/code/core/Mage/Tag/Model/Session.php index 107c059766f..3aed394c58e 100644 --- a/app/code/core/Mage/Tag/Model/Session.php +++ b/app/code/core/Mage/Tag/Model/Session.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..fbc4cbf481c 100644 --- a/app/code/core/Mage/Tag/Model/Tag.php +++ b/app/code/core/Mage/Tag/Model/Tag.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +49,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; @@ -426,7 +426,7 @@ public function saveRelation($productId, $customerId, $storeId) * Check whether product is already marked in store with tag * * @param Mage_Tag_Model_Tag_Relation $relationModel - * @return boolean + * @return bool */ protected function _checkLinkBetweenTagProduct($relationModel) { diff --git a/app/code/core/Mage/Tag/Model/Tag/Relation.php b/app/code/core/Mage/Tag/Model/Tag/Relation.php index 7f675380418..3dc8d3887ba 100644 --- a/app/code/core/Mage/Tag/Model/Tag/Relation.php +++ b/app/code/core/Mage/Tag/Model/Tag/Relation.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tag relation model * + * @category Mage + * @package Mage_Tag + * @author Magento Core Team + * * @method Mage_Tag_Model_Resource_Tag_Relation _getResource() * @method Mage_Tag_Model_Resource_Tag_Relation getResource() * @method int getActive() @@ -41,10 +46,6 @@ * @method $this setStoreId(int $value) * @method int getTagId() * @method $this setTagId(int $value) - * - * @category Mage - * @package Mage_Tag - * @author Magento Core Team */ class Mage_Tag_Model_Tag_Relation extends Mage_Core_Model_Abstract { @@ -60,9 +61,6 @@ class Mage_Tag_Model_Tag_Relation extends Mage_Core_Model_Abstract */ const ENTITY = 'tag_relation'; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('tag/tag_relation'); diff --git a/app/code/core/Mage/Tag/controllers/CustomerController.php b/app/code/core/Mage/Tag/controllers/CustomerController.php index 7b74451ca7f..114c7e91f4d 100644 --- a/app/code/core/Mage/Tag/controllers/CustomerController.php +++ b/app/code/core/Mage/Tag/controllers/CustomerController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php index dd00cf47a8a..9ec022346bc 100644 --- a/app/code/core/Mage/Tag/controllers/IndexController.php +++ b/app/code/core/Mage/Tag/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Tag - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tag/controllers/ListController.php b/app/code/core/Mage/Tag/controllers/ListController.php index fa870aede1f..a58acc8f2d6 100644 --- a/app/code/core/Mage/Tag/controllers/ListController.php +++ b/app/code/core/Mage/Tag/controllers/ListController.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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_ListController extends Mage_Core_Controller_Front_Action { public function indexAction() diff --git a/app/code/core/Mage/Tag/controllers/ProductController.php b/app/code/core/Mage/Tag/controllers/ProductController.php index 5e65501afdd..9f99e603c7a 100644 --- a/app/code/core/Mage/Tag/controllers/ProductController.php +++ b/app/code/core/Mage/Tag/controllers/ProductController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,9 +24,8 @@ * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @author Magento Core Team */ - class Mage_Tag_ProductController extends Mage_Core_Controller_Front_Action { public function listAction() diff --git a/app/code/core/Mage/Tag/etc/adminhtml.xml b/app/code/core/Mage/Tag/etc/adminhtml.xml index f5a7f42bc03..87552f41322 100644 --- a/app/code/core/Mage/Tag/etc/adminhtml.xml +++ b/app/code/core/Mage/Tag/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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_Tag - * @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_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 727d0b993fc..79693418eb5 100644 --- a/app/code/core/Mage/Tag/etc/api.xml +++ b/app/code/core/Mage/Tag/etc/api.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_Tag - * @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_Tag + * @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/Tag/etc/config.xml b/app/code/core/Mage/Tag/etc/config.xml index 5286ceb460f..be5b040b8f8 100644 --- a/app/code/core/Mage/Tag/etc/config.xml +++ b/app/code/core/Mage/Tag/etc/config.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_Tag - * @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_Tag + * @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/Tag/sql/tag_setup/install-1.6.0.0.php b/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php index e1090a56d81..405f7a5092f 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/install-1.6.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php index 188fd68568a..1bcbe737b3f 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php index 4282b2b1287..1fd77f4f321 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Tag - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php index 5962158caa9..377a47d0bda 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $purgeFk = [ diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php index b7562c470cf..6cb356daa30 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn( diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php index c5d9207c64d..4a436f485ce 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn($installer->getTable('tag/tag'), 'first_customer_id', "INT(10) UNSIGNED NOT NULL DEFAULT '0'"); $groupedTags = $installer->getConnection()->select() diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php index 0360ada7106..a5cbee928ae 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn($installer->getTable('tag/tag'), 'first_store_id', "smallint(5) UNSIGNED NOT NULL DEFAULT '0'"); $groupedTags = $installer->getConnection()->select() diff --git a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php index 13e684acf83..6f907fd9b9d 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php index 848a8eacbcb..36b41824432 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 56e7f349753..4496c9ea6a9 100644 --- a/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Tag/sql/tag_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Tag + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/core/Mage/Tax/Block/Adminhtml/Frontend/Region/Updater.php index e7f5aa48684..53efa1f62a9 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Adminhtml/Notifications.php b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php index 39a48219f12..5d679bbf0ef 100644 --- a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php +++ b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Notifications about not correct tax settings * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Block_Adminhtml_Notifications extends Mage_Adminhtml_Block_Template { @@ -64,7 +65,9 @@ public function getStoresWithWrongDisplaySettings() { $defaultStoreId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID; //check default store first - if (!$this->_factory->getSingleton('tax/config')->checkDisplaySettings($defaultStoreId)) { + /** @var Mage_Tax_Model_Config $model */ + $model = $this->_factory->getSingleton('tax/config'); + if (!$model->checkDisplaySettings($defaultStoreId)) { return true; } $storeNames = []; @@ -103,7 +106,7 @@ public function getStoresWithConflictingFptTaxConfigurationSettings() /** * Return boolean determining if FPT/ Catalog Price settings is conflicting or not. * - * @return boolean + * @return bool */ public function isDefaultStoreWithConflictingFptTaxConfigurationSettings() { @@ -123,7 +126,9 @@ public function isDefaultStoreWithConflictingFptTaxConfigurationSettings() */ public function checkDisplaySettings($store = null) { - return $this->_factory->getSingleton('tax/config')->checkDisplaySettings($store); + /** @var Mage_Tax_Model_Config $model */ + $model = $this->_factory->getSingleton('tax/config'); + return $model->checkDisplaySettings($store); } /** @@ -134,15 +139,18 @@ public function checkDisplaySettings($store = null) */ public function getWebsitesWithWrongDiscountSettings() { + /** @var Mage_Tax_Model_Config $model */ + $model = $this->_factory->getSingleton('tax/config'); + $defaultStoreId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID; //check default store first - if (!$this->_factory->getSingleton('tax/config')->checkDiscountSettings($defaultStoreId)) { + if (!$model->checkDiscountSettings($defaultStoreId)) { return true; } $storeNames = []; $stores = $this->_app->getStores(); foreach ($stores as $store) { - if (!$this->_factory->getSingleton('tax/config')->checkDiscountSettings($store)) { + if (!$model->checkDiscountSettings($store)) { $website = $store->getWebsite(); $storeNames[] = $website->getName() . '(' . $store->getName() . ')'; } @@ -189,7 +197,9 @@ public function getManageUrl() */ protected function _toHtml() { - if ($this->_factory->getSingleton('admin/session')->isAllowed('system/config/tax')) { + /** @var Mage_Admin_Model_Session $model */ + $model = $this->_factory->getSingleton('admin/session'); + if ($model->isAllowed('system/config/tax')) { return parent::_toHtml(); } return ''; diff --git a/app/code/core/Mage/Tax/Block/Checkout/Discount.php b/app/code/core/Mage/Tax/Block/Checkout/Discount.php index 991c5c48890..e251a34f9fc 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Discount.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php index e36233a71f5..11720e53520 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Grandtotal.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php b/app/code/core/Mage/Tax/Block/Checkout/Shipping.php index 994ad6ba6b1..66daf9d25b5 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Shipping.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Shipping.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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'; @@ -71,7 +72,7 @@ public function getShippingExcludeTax() /** * Get label for shipping include tax * - * @return float + * @return string */ public function getIncludeTaxLabel() { @@ -81,7 +82,7 @@ public function getIncludeTaxLabel() /** * Get label for shipping exclude tax * - * @return float + * @return string */ public function getExcludeTaxLabel() { diff --git a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php index b01b2b27eb9..0e42b92aa80 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Subtotal.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..293d24cce83 100644 --- a/app/code/core/Mage/Tax/Block/Checkout/Tax.php +++ b/app/code/core/Mage/Tax/Block/Checkout/Tax.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7d984993770 100644 --- a/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Block/Sales/Order/Tax.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -298,7 +299,7 @@ protected function _initGrandTotal() } /** - * @return mixed + * @return Mage_Sales_Model_Order */ public function getOrder() { diff --git a/app/code/core/Mage/Tax/Exception.php b/app/code/core/Mage/Tax/Exception.php index aa6ea22fa5b..db14be77def 100644 --- a/app/code/core/Mage/Tax/Exception.php +++ b/app/code/core/Mage/Tax/Exception.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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..8a8ac6b3beb 100644 --- a/app/code/core/Mage/Tax/Helper/Data.php +++ b/app/code/core/Mage/Tax/Helper/Data.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { @@ -35,6 +36,8 @@ class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract */ const PRICE_CONVERSION_MINUS = 2; + protected $_moduleName = 'Mage_Tax'; + /** * Tax configuration object * @@ -101,7 +104,7 @@ class Mage_Tax_Helper_Data extends Mage_Core_Helper_Abstract /** * Postcode cut to this length when creating search templates * - * @var integer + * @var int */ protected $_postCodeSubStringLength = 10; @@ -126,7 +129,7 @@ public function __construct(array $args = []) /** * Return max postcode length to create search templates * - * @return integer $len + * @return int $len */ public function getPostCodeSubStringLength() { @@ -1151,11 +1154,11 @@ public function getAllWeee($source = null) if (!$helper->includeInSubtotal($store)) { foreach ($source->getAllItems() as $item) { foreach ($helper->getApplied($item) as $tax) { - $weeeDiscount = isset($tax['weee_discount']) ? $tax['weee_discount'] : 0; + $weeeDiscount = $tax['weee_discount'] ?? 0; $title = $tax['title']; - $rowAmount = isset($tax['row_amount']) ? $tax['row_amount'] : 0; - $rowAmountInclTax = isset($tax['row_amount_incl_tax']) ? $tax['row_amount_incl_tax'] : 0; + $rowAmount = $tax['row_amount'] ?? 0; + $rowAmountInclTax = $tax['row_amount_incl_tax'] ?? 0; $amountDisplayed = ($helper->isTaxIncluded()) ? $rowAmountInclTax : $rowAmount; if (array_key_exists($title, $allWeee)) { @@ -1205,7 +1208,7 @@ public function isConflictingFptTaxConfigurationSettingsIgnored() * Return whether cross border trade is enabled or not * * @param null|int $store - * @return boolean + * @return bool */ public function isCrossBorderTradeEnabled($store = null) { diff --git a/app/code/core/Mage/Tax/Model/Calculation.php b/app/code/core/Mage/Tax/Model/Calculation.php index 338379be014..2de5fe68be2 100644 --- a/app/code/core/Mage/Tax/Model/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Calculation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -126,9 +127,6 @@ class Mage_Tax_Model_Calculation extends Mage_Core_Model_Abstract */ protected $_taxHelper; - /** - * Constructor - */ protected function _construct() { $this->_init('tax/calculation'); @@ -616,7 +614,7 @@ public function getApplicableRateIds($request) * Get the calculation process * * @param array $rates - * @return mixed + * @return array */ public function reproduceProcess($rates) { @@ -627,7 +625,7 @@ public function reproduceProcess($rates) * Get rates by customer tax class * * @param int $customerTaxClass - * @return mixed + * @return array */ public function getRatesByCustomerTaxClass($customerTaxClass) { @@ -639,7 +637,7 @@ public function getRatesByCustomerTaxClass($customerTaxClass) * * @param int $customerTaxClass * @param int $productTaxClass - * @return mixed + * @return array */ public function getRatesByCustomerAndProductTaxClasses($customerTaxClass, $productTaxClass) { @@ -652,8 +650,8 @@ public function getRatesByCustomerAndProductTaxClasses($customerTaxClass, $produ * * @param float $price * @param float $taxRate - * @param boolean $priceIncludeTax - * @param boolean $round + * @param bool $priceIncludeTax + * @param bool $round * @return float */ public function calcTaxAmount($price, $taxRate, $priceIncludeTax = false, $round = true) diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Calculation/Rate.php index 5a185c24e51..8e3fd455554 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax Rate Model * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team + * * @method Mage_Tax_Model_Resource_Calculation_Rate _getResource() * @method Mage_Tax_Model_Resource_Calculation_Rate getResource() * @method Mage_Tax_Model_Resource_Calculation_Rate_Collection getCollection() @@ -46,10 +51,6 @@ * @method $this setZipFrom(int $value) * @method int getZipTo() * @method $this setZipTo(int $value) - * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team */ class Mage_Tax_Model_Calculation_Rate extends Mage_Core_Model_Abstract { 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..feb5686bb54 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rate/Title.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 +36,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/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Calculation/Rule.php index f7aa4afbdfe..95330f6b34b 100644 --- a/app/code/core/Mage/Tax/Model/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Calculation/Rule.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax Rule Model * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team + * * @method Mage_Tax_Model_Resource_Calculation_Rule _getResource() * @method Mage_Tax_Model_Resource_Calculation_Rule getResource() * @method Mage_Tax_Model_Resource_Calculation_Rule_Collection getCollection() @@ -35,10 +40,6 @@ * @method float getTaxRate() * @method string getTaxCustomerClass() * @method string getTaxProductClass() - * - * @category Mage - * @package Mage_Tax - * @author Magento Core Team */ class Mage_Tax_Model_Calculation_Rule extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Tax/Model/Class.php b/app/code/core/Mage/Tax/Model/Class.php index e486de60264..3aa58c3ee0f 100644 --- a/app/code/core/Mage/Tax/Model/Class.php +++ b/app/code/core/Mage/Tax/Model/Class.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..19a104262c0 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Customer.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Customer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * 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/Class/Source/Product.php b/app/code/core/Mage/Tax/Model/Class/Source/Product.php index e2f71ba07d6..017c7d51672 100644 --- a/app/code/core/Mage/Tax/Model/Class/Source/Product.php +++ b/app/code/core/Mage/Tax/Model/Class/Source/Product.php @@ -7,25 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Tax_Model_Class_Source_Product + * + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Class_Source_Product extends Mage_Eav_Model_Entity_Attribute_Source_Abstract { /** - * Get all options - * * @param bool $withEmpty * @return array */ @@ -49,8 +52,8 @@ public function getAllOptions($withEmpty = false) /** * Get a text for option value * - * @param string|integer $value - * @return string + * @param string|int $value + * @return string|false */ public function getOptionText($value) { diff --git a/app/code/core/Mage/Tax/Model/Config.php b/app/code/core/Mage/Tax/Model/Config.php index bc788ed639f..fd97086c85a 100644 --- a/app/code/core/Mage/Tax/Model/Config.php +++ b/app/code/core/Mage/Tax/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Config/Notification.php b/app/code/core/Mage/Tax/Model/Config/Notification.php index cce092686a9..95cc619cd11 100644 --- a/app/code/core/Mage/Tax/Model/Config/Notification.php +++ b/app/code/core/Mage/Tax/Model/Config/Notification.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Tax/Model/Config/Price/Include.php b/app/code/core/Mage/Tax/Model/Config/Price/Include.php index f5c053e5880..a1f395bdb63 100644 --- a/app/code/core/Mage/Tax/Model/Config/Price/Include.php +++ b/app/code/core/Mage/Tax/Model/Config/Price/Include.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php index 2941e7eec34..d7f912e5801 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php index 22b8c9b23b0..af375cac568 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php index 40cb33e37ad..81854d118b7 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax rate 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_Calculation_Rate extends Mage_Tax_Model_Resource_Calculation_Rate diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php index 767594ed94b..cc46de1ae25 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..09123b498a6 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php index f9b1e7d001e..8e8a0c72da6 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rate/Title/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php index 3dbb6dc28b2..b6797a5976e 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax rate 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_Calculation_Rule extends Mage_Tax_Model_Resource_Calculation_Rule diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php index efd7a57493f..74473afd94c 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Calculation/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class.php b/app/code/core/Mage/Tax/Model/Mysql4/Class.php index f576478a1c2..c59a9a60060 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Class.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php index bb5d731ad14..2e3cad72444 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Class/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php index 5ac9b0eb810..a5df9ea33c2 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..abe146a1fe2 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Tax.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Report/Updatedat/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php index 2e8d1fbdce7..593c9f34b65 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Report/Updatedat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..522a214fbfb 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 @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php index 893f62cf527..c8be18b1c24 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Sales/Order/Tax/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php index 018219f8828..04c32f0c3bc 100644 --- a/app/code/core/Mage/Tax/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Tax/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Tax/Model/Observer.php index 2e63f444ac4..a70025653ba 100644 --- a/app/code/core/Mage/Tax/Model/Observer.php +++ b/app/code/core/Mage/Tax/Model/Observer.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax Event Observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Tax + * @author Magento Core Team */ class Mage_Tax_Model_Observer { @@ -111,7 +114,7 @@ public function salesEventOrderAfterSave(Varien_Event_Observer $observer) } $baseRealAmount = $row['base_amount'] / $row['percent'] * $tax['percent']; } - $hidden = (isset($row['hidden']) ? $row['hidden'] : 0); + $hidden = $row['hidden'] ?? 0; $data = [ 'order_id' => $order->getId(), 'code' => $tax['code'], diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation.php b/app/code/core/Mage/Tax/Model/Resource/Calculation.php index 3fa6b7d0910..2c6191516c0 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -41,10 +42,6 @@ class Mage_Tax_Model_Resource_Calculation extends Mage_Core_Model_Resource_Db_Ab */ protected $_isPkAutoIncrement = false; - /** - * Resource initialization - * - */ protected function _construct() { $this->_setMainTable('tax/tax_calculation'); @@ -128,7 +125,7 @@ public function getCalculationProcess($request, $rates = null) $countedRates = count($rates); for ($i = 0; $i < $countedRates; $i++) { $rate = $rates[$i]; - $value = (isset($rate['value']) ? $rate['value'] : $rate['percent']) * 1; + $value = ($rate['value'] ?? $rate['percent']) * 1; $oneRate = [ 'code' => $rate['code'], diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php index 543f3003312..64f7864fb29 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,6 @@ */ class Mage_Tax_Model_Resource_Calculation_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/calculation'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php index 546b95e63fd..37f47b8fa1a 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax rate 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_Calculation_Rate extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_calculation_rate', 'tax_calculation_rate_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php index 497f3966942..48efb353759 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,9 +35,6 @@ class Mage_Tax_Model_Resource_Calculation_Rate_Collection extends Mage_Core_Mode */ const TAX_RULES_CHUNK_SIZE = 1000; - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/calculation_rate'); 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..3399b6c6e71 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 @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Calculation/Rate/Title/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php index 221b71c6bec..2acaa982f80 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,6 @@ */ class Mage_Tax_Model_Resource_Calculation_Rate_Title_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/calculation_rate_title', 'tax/calculation_rate_title'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php index d3896b3a4c6..f3a68366a71 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Tax rate 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_Calculation_Rule extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/tax_calculation_rule', 'tax_calculation_rule_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php index 474540cff74..299ec0817ea 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Calculation/Rule/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,6 @@ */ class Mage_Tax_Model_Resource_Calculation_Rule_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/calculation_rule'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Class.php b/app/code/core/Mage/Tax/Model/Resource/Class.php index 96ff995ec17..2071550c6f0 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Class.php +++ b/app/code/core/Mage/Tax/Model/Resource/Class.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,10 +28,6 @@ */ class Mage_Tax_Model_Resource_Class extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - * - */ public function _construct() { $this->_init('tax/tax_class', 'class_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php index be127ce6b40..50f55d93de3 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Class/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,6 @@ */ class Mage_Tax_Model_Resource_Class_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ public function _construct() { $this->_init('tax/class'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php index 52221d8172d..8190f398895 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..7f397fe7937 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Createdat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php index 648284a8b34..5603b333da5 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -27,9 +28,6 @@ */ class Mage_Tax_Model_Resource_Report_Tax_Createdat 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..2d8a6bf1eff 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 @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Report/Updatedat/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php index 6b2f670a44d..e36403237fc 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Report/Updatedat/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..8a83bad4c26 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 @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Sales/Order/Tax/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php index 5c44f8e04b8..90e68668588 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -29,9 +30,6 @@ */ class Mage_Tax_Model_Resource_Sales_Order_Tax_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/sales_order_tax'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php index 1aac284e57c..09e65c92a54 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item.php @@ -7,29 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Item extends Mage_Core_Model_Resource_Db_Abstract { - /** - * Resource initialization - */ protected function _construct() { $this->_init('tax/sales_order_tax_item', 'tax_item_id'); diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php index e5bb7a6de44..c031c0ac728 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php +++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/Resource/Setup.php b/app/code/core/Mage/Tax/Model/Resource/Setup.php index 8a1473881b5..677ab138c9d 100644 --- a/app/code/core/Mage/Tax/Model/Resource/Setup.php +++ b/app/code/core/Mage/Tax/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..17872e367f1 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Order/Tax.php @@ -7,18 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +50,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/Order/Tax/Item.php b/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php index cf7406adb4b..0ef64f7a2f7 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php +++ b/app/code/core/Mage/Tax/Model/Sales/Order/Tax/Item.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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 * * @method Mage_Tax_Model_Resource_Sales_Order_Tax_Item _getResource() * @method Mage_Tax_Model_Resource_Sales_Order_Tax_Item getResource() @@ -29,9 +30,6 @@ */ class Mage_Tax_Model_Sales_Order_Tax_Item extends Mage_Core_Model_Abstract { - /** - * Initialization - */ protected function _construct() { $this->_init('tax/sales_order_tax_item'); diff --git a/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php b/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php index c31a4aa0a7c..feaa091c309 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Grandtotal.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..c92bd388749 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Shipping.php @@ -7,19 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..e9b4a31da0e 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Subtotal.php @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..b59d4475bfb 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Pdf/Tax.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Discount.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php index 50106650c3b..df6f0f90e84 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Discount.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..1a46cb7a17e 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 @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..b9d83db6a18 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 @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..28db41f6fdc 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -204,7 +205,7 @@ protected function _round($price, $rate, $direction, $type = 'regular') $deltas = $this->_address->getRoundingDeltas(); $key = $type.$direction; $rate = (string) $rate; - $delta = isset($deltas[$key][$rate]) ? $deltas[$key][$rate] : 0; + $delta = $deltas[$key][$rate] ?? 0; return $this->_calculator->round($price+$delta); } 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..de75e020aef 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -708,7 +713,7 @@ protected function _deltaRound($price, $rate, $direction, $type = 'regular') $rate = (string)$rate; $type = $type . $direction; // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5 - $delta = isset($this->_roundingDeltas[$type][$rate]) ? $this->_roundingDeltas[$type][$rate] :0.000001; + $delta = $this->_roundingDeltas[$type][$rate] ?? 0.000001; $price += $delta; $this->_roundingDeltas[$type][$rate] = $price - $this->_calculator->round($price); $price = $this->_calculator->round($price); 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..89555089852 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 @@ -7,19 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -450,7 +455,7 @@ protected function _unitBaseCalculation(Mage_Sales_Model_Quote_Address $address, * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param Varien_Object $taxRateRequest * @param array $itemTaxGroups - * @param boolean $catalogPriceInclTax + * @param bool $catalogPriceInclTax */ protected function _unitBaseProcessItemTax( $address, @@ -526,7 +531,7 @@ protected function _unitBaseProcessItemTax( * @param float $rate * @param array $taxGroups * @param string $taxId - * @param boolean $recalculateRowTotalInclTax + * @param bool $recalculateRowTotalInclTax * @return $this */ protected function _calcUnitTaxAmount( @@ -728,7 +733,7 @@ protected function _rowBaseCalculation(Mage_Sales_Model_Quote_Address $address, * @param Mage_Sales_Model_Quote_Item_Abstract $item * @param Varien_Object $taxRateRequest * @param array $itemTaxGroups - * @param boolean $catalogPriceInclTax + * @param bool $catalogPriceInclTax */ protected function _rowBaseProcessItemTax($address, $item, $taxRateRequest, &$itemTaxGroups, $catalogPriceInclTax) { @@ -796,7 +801,7 @@ protected function _rowBaseProcessItemTax($address, $item, $taxRateRequest, &$it * @param float $rate * @param array $taxGroups * @param string $taxId - * @param boolean $recalculateRowTotalInclTax + * @param bool $recalculateRowTotalInclTax * @return $this */ protected function _calcRowTaxAmount( @@ -1022,7 +1027,7 @@ protected function _totalBaseCalculation(Mage_Sales_Model_Quote_Address $address * @param Varien_Object $taxRateRequest * @param array $taxGroups * @param array $itemTaxGroups - * @param boolean $catalogPriceInclTax + * @param bool $catalogPriceInclTax */ protected function _totalBaseProcessItemTax( $item, @@ -1275,15 +1280,15 @@ protected function _calculateWeeeAmountInclTax($item, $appliedRates, $base = tru $weeeAmountExclTax = 0; if ($base) { - $weeeAmountInclTax = isset($tax['base_amount_incl_tax']) ? $tax['base_amount_incl_tax'] : 0; - $weeeAmountExclTax = isset($tax['base_amount']) ? $tax['base_amount'] : 0; - $weeeRowAmountInclTax = isset($tax['base_row_amount_incl_tax']) ? $tax['base_row_amount_incl_tax'] : 0; - $weeeRowAmountExclTax = isset($tax['base_row_amount']) ? $tax['base_row_amount'] : 0; + $weeeAmountInclTax = $tax['base_amount_incl_tax'] ?? 0; + $weeeAmountExclTax = $tax['base_amount'] ?? 0; + $weeeRowAmountInclTax = $tax['base_row_amount_incl_tax'] ?? 0; + $weeeRowAmountExclTax = $tax['base_row_amount'] ?? 0; } else { - $weeeAmountInclTax = isset($tax['amount_incl_tax']) ? $tax['amount_incl_tax'] : 0; - $weeeAmountExclTax = isset($tax['amount']) ? $tax['amount'] : 0; - $weeeRowAmountInclTax = isset($tax['row_amount_incl_tax']) ? $tax['row_amount_incl_tax'] : 0; - $weeeRowAmountExclTax = isset($tax['row_amount']) ? $tax['row_amount'] : 0; + $weeeAmountInclTax = $tax['amount_incl_tax'] ?? 0; + $weeeAmountExclTax = $tax['amount'] ?? 0; + $weeeRowAmountInclTax = $tax['row_amount_incl_tax'] ?? 0; + $weeeRowAmountExclTax = $tax['row_amount'] ?? 0; } $weeeTax = []; @@ -1352,11 +1357,11 @@ protected function _calculateWeeeTax($discountAmount, $item, $rate, $base = true $weeeAmountExclTax = 0; if ($base) { - $weeeAmountInclTax = isset($tax['base_amount_incl_tax']) ? $tax['base_amount_incl_tax'] : 0; - $weeeAmountExclTax = isset($tax['base_amount']) ? $tax['base_amount'] : 0; + $weeeAmountInclTax = $tax['base_amount_incl_tax'] ?? 0; + $weeeAmountExclTax = $tax['base_amount'] ?? 0; } else { - $weeeAmountInclTax = isset($tax['amount_incl_tax']) ? $tax['amount_incl_tax'] : 0; - $weeeAmountExclTax = isset($tax['amount']) ? $tax['amount'] : 0; + $weeeAmountInclTax = $tax['amount_incl_tax'] ?? 0; + $weeeAmountExclTax = $tax['amount'] ?? 0; } $weeeTaxWithOutDiscount = $this->_getWeeeTax($rate, $item, 0, $weeeAmountInclTax, $weeeAmountExclTax); @@ -1408,11 +1413,11 @@ protected function _calculateRowWeeeTax($discountAmount, $item, $rate, $base = t $weeeAmountExclTax = 0; if ($base) { - $weeeAmountInclTax = isset($tax['base_row_amount_incl_tax']) ? $tax['base_row_amount_incl_tax'] : 0; - $weeeAmountExclTax = isset($tax['base_row_amount']) ? $tax['base_row_amount'] : 0; + $weeeAmountInclTax = $tax['base_row_amount_incl_tax'] ?? 0; + $weeeAmountExclTax = $tax['base_row_amount'] ?? 0; } else { - $weeeAmountInclTax = isset($tax['row_amount_incl_tax']) ? $tax['row_amount_incl_tax'] : 0; - $weeeAmountExclTax = isset($tax['row_amount']) ? $tax['row_amount'] : 0; + $weeeAmountInclTax = $tax['row_amount_incl_tax'] ?? 0; + $weeeAmountExclTax = $tax['row_amount'] ?? 0; } $weeeTaxWithOutDiscount = $this->_getWeeeTax($rate, $item, 0, $weeeAmountInclTax, $weeeAmountExclTax); @@ -1486,7 +1491,7 @@ protected function _deltaRound($price, $rate, $direction, $type = 'regular') $rate = (string)$rate; $type = $type . $direction; // initialize the delta to a small number to avoid non-deterministic behavior with rounding of 0.5 - $delta = isset($this->_roundingDeltas[$type][$rate]) ? $this->_roundingDeltas[$type][$rate] : 0.000001; + $delta = $this->_roundingDeltas[$type][$rate] ?? 0.000001; $price += $delta; $this->_roundingDeltas[$type][$rate] = $price - $this->_calculator->round($price); $price = $this->_calculator->round($price); diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php index dec96c6d8ee..e3b47b39d87 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Algorithm.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php index 67207a998e6..ac65ea6176a 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Apply.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php b/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php index e5a72877679..0c479d56946 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/PriceType.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_System_Config_Source_PriceType { protected $_options; diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php index 5c6e92590a0..20262fc1bf4 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Country.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..50219eb92d7 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 @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Model/System/Config/Source/Tax/Region.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php index ef13bcd16ae..2097f7b71b1 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_System_Config_Source_Tax_Region { /** diff --git a/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php b/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php index 31d325c3cce..054c7eb7a7e 100644 --- a/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php +++ b/app/code/core/Mage/Tax/data/tax_setup/data-install-1.6.0.0.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Tax/etc/adminhtml.xml b/app/code/core/Mage/Tax/etc/adminhtml.xml index 24b0a699ed9..7075baa8148 100644 --- a/app/code/core/Mage/Tax/etc/adminhtml.xml +++ b/app/code/core/Mage/Tax/etc/adminhtml.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 8b64e2f266b..ae8e25ec868 100644 --- a/app/code/core/Mage/Tax/etc/config.xml +++ b/app/code/core/Mage/Tax/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2016-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..b30a80c9830 100644 --- a/app/code/core/Mage/Tax/etc/system.xml +++ b/app/code/core/Mage/Tax/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php index 92cfa546316..7a8084540ca 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/install-1.6.0.0.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ + /** @var Mage_Tax_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); -// + /** * Create table 'tax/class' */ diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php index c456d4667d2..797c232ca66 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php index 34b0d60437f..4275b6cc971 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-install-1.4.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php index f9d3e8ad738..1c67b7dd75f 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.6.1-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Core_Model_Resource_Setup $this */ $installer = $this; - $installer->startSetup(); $installer->run("DROP TABLE IF EXISTS {$this->getTable('tax_class_group')};"); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php index 6cd4a57ec85..88fa9a4da94 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,29 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Tax Rate SQL upgrade - * * @category Mage * @package Mage_Tax - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$this->getTable('tax_rate_data')} DROP FOREIGN KEY `FK_TAX_RATE_DATA_TAX_RATE`; ALTER TABLE {$this->getTable('tax_rate')} CHANGE `tax_rate_id` `tax_rate_id` INT UNSIGNED NOT NULL AUTO_INCREMENT; @@ -37,4 +30,5 @@ ALTER TABLE {$this->getTable('tax_rate_data')} CHANGE `tax_rate_id` `tax_rate_id` INT UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE {$this->getTable('tax_rate_data')} ADD CONSTRAINT `FK_TAX_RATE_DATA_TAX_RATE` FOREIGN KEY (`tax_rate_id`) REFERENCES {$this->getTable('tax_rate')} (`tax_rate_id`) ON DELETE CASCADE ON UPDATE CASCADE; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php index c6028fb9973..8f8e325addc 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Tax Rate SQL upgrade - * * @category Mage * @package Mage_Tax - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $conn = $installer->getConnection(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php index ff9d22bc8d7..b2ac235f9b3 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.10-0.7.11.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php index 1d3c06628b6..9dc0cc70729 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.11-0.7.12.php @@ -7,23 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$this->getTable('tax_calculation_rate')} CHANGE `zip_from` `zip_from` INT(11) UNSIGNED NULL DEFAULT NULL; ALTER TABLE {$this->getTable('tax_calculation_rate')} CHANGE `zip_to` `zip_to` INT(11) UNSIGNED NULL DEFAULT NULL; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php index 6b4f2be8f40..0b1bd47a8ce 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.12-0.7.13.php @@ -7,22 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); + $installer->run(" ALTER TABLE {$this->getTable('tax_calculation_rate')} CHANGE `tax_postcode` `tax_postcode` VARCHAR(21) NOT NULL; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php index 06922eecd79..95ce13252f5 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.2-0.7.3.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Tax Rate SQL upgrade - * * @category Mage * @package Mage_Tax - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); if (!$installer->getConnection()->fetchOne("select * from {$this->getTable('tax_class')} where `class_name`='Shipping' and `class_type`='PRODUCT'")) { diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php index 3ea9e7f5457..14f5fd6adfc 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.3-0.7.4.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Tax Rate SQL upgrade - * * @category Mage * @package Mage_Tax - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $table = $installer->getTable('tax_rate'); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php index 67075f9acb7..81d940e2634 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); $customerTaxClassIds = $installer->getConnection()->fetchCol( diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php index 331c1b3b285..b831377f92b 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Customer_Model_Entity_Setup $installer */ - +$installer = $this; $installer->startSetup(); -$table = $installer->getTable('tax_rule'); +$table = $installer->getTable('tax_rule'); $installer->run(" ALTER TABLE `{$table}` ADD `priority` SMALLINT( 5 ) NOT NULL; ALTER TABLE `{$table}` ADD INDEX `IDX_PRIORITY` (`priority`); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php index ce30fc51ca5..4c618b7c6e6 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Tax_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php index 99d7fe89391..6522172c5ba 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Tax_Model_Resource_Setup $installer */ $installer = $this; - $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('sales_order_tax'), 'hidden', "smallint (5) unsigned not null default 0"); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php index 2c3d64f4c11..81eaf16898b 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $installer->addAttribute('invoice', 'shipping_tax_amount', ['type'=>'decimal']); $installer->addAttribute('invoice', 'base_shipping_tax_amount', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php index dc974a2659b..c291c230686 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-0.7.9-0.7.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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; $installer->startSetup(); $table = $installer->getTable('tax_calculation_rate'); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php index 4d07073e142..f079b13dda7 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.3.9-1.4.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php index 7abd5c0dc94..30c56c48168 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.0-1.4.0.1.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php index cbefcf20f06..2af40e5ea34 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.4.0.1-1.4.0.2.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->changeColumn( $installer->getTable('tax/tax_calculation_rate'), 'tax_postcode', 'tax_postcode', 'VARCHAR(21) NULL DEFAULT NULL' ); + $installer->endSetup(); diff --git a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 89b73545993..0a8a20128d5 100644 --- a/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Tax/sql/tax_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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.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..f749b5eea3f 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 @@ -7,20 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..75386892d5a 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..f13a8b10bfb 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 @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..5a34a58a7f7 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Tax + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Abstract.php b/app/code/core/Mage/Uploader/Block/Abstract.php index de719daf866..c8d65934d94 100644 --- a/app/code/core/Mage/Uploader/Block/Abstract.php +++ b/app/code/core/Mage/Uploader/Block/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Uploader - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Uploader/Block/Multiple.php b/app/code/core/Mage/Uploader/Block/Multiple.php index f15f8821130..27e5373cad9 100644 --- a/app/code/core/Mage/Uploader/Block/Multiple.php +++ b/app/code/core/Mage/Uploader/Block/Multiple.php @@ -7,28 +7,28 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Uploader + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Multiple extends Mage_Uploader_Block_Abstract { - /** - * - * Default upload button ID suffix - */ const DEFAULT_UPLOAD_BUTTON_ID_SUFFIX = 'upload'; /** - * Prepare layout, create upload button - * * @return $this */ protected function _prepareLayout() diff --git a/app/code/core/Mage/Uploader/Block/Single.php b/app/code/core/Mage/Uploader/Block/Single.php index e5879c70cd9..40d891cfc34 100644 --- a/app/code/core/Mage/Uploader/Block/Single.php +++ b/app/code/core/Mage/Uploader/Block/Single.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Uploader + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..05be8030730 100644 --- a/app/code/core/Mage/Uploader/Helper/Data.php +++ b/app/code/core/Mage/Uploader/Helper/Data.php @@ -7,22 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Uploader - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Uploader'; } diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php index c35dce2f8fc..408219f9429 100644 --- a/app/code/core/Mage/Uploader/Helper/File.php +++ b/app/code/core/Mage/Uploader/Helper/File.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Uploader - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,6 +26,8 @@ */ class Mage_Uploader_Helper_File extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Uploader'; + /** * List of pre-defined MIME types * @@ -655,10 +658,7 @@ public function __construct() public function getMimeTypeByExtension($ext) { $type = 'x' . $ext; - if (isset($this->_mimeTypes[$type])) { - return $this->_mimeTypes[$type]; - } - return 'application/octet-stream'; + return $this->_mimeTypes[$type] ?? 'application/octet-stream'; } /** diff --git a/app/code/core/Mage/Uploader/Model/Config/Abstract.php b/app/code/core/Mage/Uploader/Model/Config/Abstract.php index a81d6a2c703..0d8df9d3e29 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Abstract.php +++ b/app/code/core/Mage/Uploader/Model/Config/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Uploader - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,7 +26,6 @@ * @package Mage_Uploader * @author Magento Core Team */ - abstract class Mage_Uploader_Model_Config_Abstract extends Varien_Object { /** @@ -52,10 +52,10 @@ public function __call($method, $args) $key = lcfirst($this->_camelize(substr($method,3))); switch (substr($method, 0, 3)) { case 'get' : - return $this->getData($key, isset($args[0]) ? $args[0] : null); + return $this->getData($key, $args[0] ?? null); case 'set' : - return $this->setData($key, isset($args[0]) ? $args[0] : null); + return $this->setData($key, $args[0] ?? null); case 'uns' : return $this->unsetData($key); diff --git a/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php b/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php index fcce1122133..9f5dfafabe0 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php +++ b/app/code/core/Mage/Uploader/Model/Config/Browsebutton.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Uploader - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -23,14 +24,14 @@ * @package Mage_Uploader * @author Magento Core Team * - * @method Mage_Uploader_Model_Config_Browsebutton setDomNodes(array $domNodesIds) + * @method $this setDomNodes(array $domNodesIds) * Array of element browse buttons ids - * @method Mage_Uploader_Model_Config_Browsebutton setIsDirectory(bool $isDirectory) + * @method $this setIsDirectory(bool $isDirectory) * Pass in true to allow directories to be selected (Google Chrome only) - * @method Mage_Uploader_Model_Config_Browsebutton setSingleFile(bool $isSingleFile) + * @method $this setSingleFile(bool $isSingleFile) * To prevent multiple file uploads set this to true. * Also look at config parameter singleFile (Mage_Uploader_Model_Config_Uploader setSingleFile()) - * @method Mage_Uploader_Model_Config_Browsebutton setAttributes(array $attributes) + * @method $this setAttributes(array $attributes) * Pass object of keys and values to set custom attributes on input fields. * @see http://www.w3.org/TR/html-markup/input.file.html#input.file-attributes */ diff --git a/app/code/core/Mage/Uploader/Model/Config/Misc.php b/app/code/core/Mage/Uploader/Model/Config/Misc.php index ae97a6e41f0..0ad0a51d37e 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Misc.php +++ b/app/code/core/Mage/Uploader/Model/Config/Misc.php @@ -7,31 +7,29 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Uploader + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Misc Config Parameters * - * @category Mage - * @package Mage_Uploader - */ - -/** - * @method Mage_Uploader_Model_Config_Misc setMaxSizePlural (string $sizePlural) Set plural info about max upload size - * @method Mage_Uploader_Model_Config_Misc setMaxSizeInBytes (int $sizeInBytes) Set max upload size in bytes - * @method Mage_Uploader_Model_Config_Misc setReplaceBrowseWithRemove (bool $replaceBrowseWithRemove) - * Replace browse button with remove + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team * - * Class Mage_Uploader_Model_Config_Misc + * @method $this setMaxSizePlural (string $sizePlural) Set plural info about max upload size + * @method $this setMaxSizeInBytes (int $sizeInBytes) Set max upload size in bytes + * @method $this setReplaceBrowseWithRemove (bool $replaceBrowseWithRemove) + * Replace browse button with remove */ class Mage_Uploader_Model_Config_Misc extends Mage_Uploader_Model_Config_Abstract { diff --git a/app/code/core/Mage/Uploader/Model/Config/Uploader.php b/app/code/core/Mage/Uploader/Model/Config/Uploader.php index 472973e816e..5527e55e1a7 100644 --- a/app/code/core/Mage/Uploader/Model/Config/Uploader.php +++ b/app/code/core/Mage/Uploader/Model/Config/Uploader.php @@ -7,74 +7,72 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Uploader + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 - */ - -/** - * @method Mage_Uploader_Model_Config_Uploader setTarget(string $url) + * @category Mage + * @package Mage_Uploader + * @author Magento Core Team + * + * @method $this setTarget(string $url) * The target URL for the multipart POST request. - * @method Mage_Uploader_Model_Config_Uploader setSingleFile(bool $isSingleFile) + * @method $this setSingleFile(bool $isSingleFile) * Enable single file upload. * Once one file is uploaded, second file will overtake existing one, first one will be canceled. - * @method Mage_Uploader_Model_Config_Uploader setChunkSize(int $chunkSize) The size in bytes of each uploaded chunk of data. - * @method Mage_Uploader_Model_Config_Uploader setForceChunkSize(bool $forceChunkSize) + * @method $this setChunkSize(int $chunkSize) The size in bytes of each uploaded chunk of data. + * @method $this setForceChunkSize(bool $forceChunkSize) * Force all chunks to be less or equal than chunkSize. - * @method Mage_Uploader_Model_Config_Uploader setSimultaneousUploads(int $amountOfSimultaneousUploads) - * @method Mage_Uploader_Model_Config_Uploader setFileParameterName(string $fileUploadParam) - * @method Mage_Uploader_Model_Config_Uploader setQuery(array $additionalQuery) - * @method Mage_Uploader_Model_Config_Uploader setHeaders(array $headers) + * @method $this setSimultaneousUploads(int $amountOfSimultaneousUploads) + * @method $this setFileParameterName(string $fileUploadParam) + * @method $this setQuery(array $additionalQuery) + * @method $this setHeaders(array $headers) * Extra headers to include in the multipart POST with data. - * @method Mage_Uploader_Model_Config_Uploader setWithCredentials(bool $isCORS) + * @method $this setWithCredentials(bool $isCORS) * Standard CORS requests do not send or set any cookies by default. * In order to include cookies as part of the request, you need to set the withCredentials property to true. - * @method Mage_Uploader_Model_Config_Uploader setMethod(string $sendMethod) + * @method $this setMethod(string $sendMethod) * Method to use when POSTing chunks to the server. Defaults to "multipart" - * @method Mage_Uploader_Model_Config_Uploader setTestMethod(string $testMethod) Defaults to "GET" - * @method Mage_Uploader_Model_Config_Uploader setUploadMethod(string $uploadMethod) Defaults to "POST" - * @method Mage_Uploader_Model_Config_Uploader setAllowDuplicateUploads(bool $allowDuplicateUploads) + * @method $this setTestMethod(string $testMethod) Defaults to "GET" + * @method $this setUploadMethod(string $uploadMethod) Defaults to "POST" + * @method $this setAllowDuplicateUploads(bool $allowDuplicateUploads) * Once a file is uploaded, allow reupload of the same file. By default, if a file is already uploaded, * it will be skipped unless the file is removed from the existing Flow object. - * @method Mage_Uploader_Model_Config_Uploader setPrioritizeFirstAndLastChunk(bool $prioritizeFirstAndLastChunk) + * @method $this setPrioritizeFirstAndLastChunk(bool $prioritizeFirstAndLastChunk) * This can be handy if you can determine if a file is valid for your service from only the first or last chunk. - * @method Mage_Uploader_Model_Config_Uploader setTestChunks(bool $prioritizeFirstAndLastChunk) + * @method $this setTestChunks(bool $prioritizeFirstAndLastChunk) * Make a GET request to the server for each chunks to see if it already exists. - * @method Mage_Uploader_Model_Config_Uploader setPreprocess(bool $prioritizeFirstAndLastChunk) + * @method $this setPreprocess(bool $prioritizeFirstAndLastChunk) * Optional function to process each chunk before testing & sending. - * @method Mage_Uploader_Model_Config_Uploader setInitFileFn(string $function) + * @method $this setInitFileFn(string $function) * Optional function to initialize the fileObject (js). - * @method Mage_Uploader_Model_Config_Uploader setReadFileFn(string $function) + * @method $this setReadFileFn(string $function) * Optional function wrapping reading operation from the original file. - * @method Mage_Uploader_Model_Config_Uploader setGenerateUniqueIdentifier(string $function) + * @method $this setGenerateUniqueIdentifier(string $function) * Override the function that generates unique identifiers for each file. Defaults to "null" - * @method Mage_Uploader_Model_Config_Uploader setMaxChunkRetries(int $maxChunkRetries) Defaults to 0 - * @method Mage_Uploader_Model_Config_Uploader setChunkRetryInterval(int $chunkRetryInterval) Defaults to "undefined" - * @method Mage_Uploader_Model_Config_Uploader setProgressCallbacksInterval(int $progressCallbacksInterval) - * @method Mage_Uploader_Model_Config_Uploader setSpeedSmoothingFactor(int $speedSmoothingFactor) + * @method $this setMaxChunkRetries(int $maxChunkRetries) Defaults to 0 + * @method $this setChunkRetryInterval(int $chunkRetryInterval) Defaults to "undefined" + * @method $this setProgressCallbacksInterval(int $progressCallbacksInterval) + * @method $this setSpeedSmoothingFactor(int $speedSmoothingFactor) * Used for calculating average upload speed. Number from 1 to 0. * Set to 1 and average upload speed wil be equal to current upload speed. * For longer file uploads it is better set this number to 0.02, * because time remaining estimation will be more accurate. - * @method Mage_Uploader_Model_Config_Uploader setSuccessStatuses(array $successStatuses) + * @method $this setSuccessStatuses(array $successStatuses) * Response is success if response status is in this list - * @method Mage_Uploader_Model_Config_Uploader setPermanentErrors(array $permanentErrors) + * @method $this 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 7c6b2f5ff9c..f17ccef69eb 100644 --- a/app/code/core/Mage/Uploader/etc/config.xml +++ b/app/code/core/Mage/Uploader/etc/config.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_Uploader - * @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_Uploader + * @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/Uploader/etc/jstranslator.xml b/app/code/core/Mage/Uploader/etc/jstranslator.xml index 803d53e6ca4..3eef50afe13 100644 --- a/app/code/core/Mage/Uploader/etc/jstranslator.xml +++ b/app/code/core/Mage/Uploader/etc/jstranslator.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_Uploader - * @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_Uploader + * @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/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php index 6fa819a4c27..2b467fc5e96 100644 --- a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -27,10 +28,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..ecc65711704 100644 --- a/app/code/core/Mage/Usa/Helper/Data.php +++ b/app/code/core/Mage/Usa/Helper/Data.php @@ -7,24 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** - * @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 { + protected $_moduleName = 'Mage_Usa'; + /** * Convert weight in different measure types * diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php index 2bc7ea8aafa..4f9781bbcfb 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -60,7 +61,7 @@ public function setActiveFlag($code = 'active') */ public function getCarrierCode() { - return isset($this->_code) ? $this->_code : null; + return $this->_code ?? null; } public function getTrackingInfo($tracking) @@ -85,7 +86,7 @@ public function getTrackingInfo($tracking) * Check if carrier has shipping tracking option available * All Mage_Usa carriers have shipping tracking option available * - * @return boolean + * @return bool */ public function isTrackingAvailable() { @@ -95,7 +96,7 @@ public function isTrackingAvailable() /** * Check if city option required * - * @return boolean + * @return bool */ public function isCityRequired() { @@ -119,7 +120,7 @@ public function isZipCodeRequired($countryId = null) /** * Check if carrier has shipping label option available * - * @return boolean + * @return bool */ public function isShippingLabelsAvailable() { @@ -164,7 +165,7 @@ public function getAllItems(Mage_Shipping_Model_Rate_Request $request) * Processing additional validation to check if carrier applicable. * * @param Mage_Shipping_Model_Rate_Request $request - * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|boolean + * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool */ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request) { @@ -222,7 +223,7 @@ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $r * Returns cache key for some request to carrier quotes service * * @param string|array $requestParams - * @return string + * @return int */ protected function _getQuotesCacheKey($requestParams) { @@ -248,7 +249,7 @@ protected function _getQuotesCacheKey($requestParams) protected function _getCachedQuotes($requestParams) { $key = $this->_getQuotesCacheKey($requestParams); - return isset(self::$_quotesCache[$key]) ? self::$_quotesCache[$key] : null; + return self::$_quotesCache[$key] ?? null; } /** @@ -418,7 +419,7 @@ abstract protected function _doShipmentRequest(Varien_Object $request); * Check is Country U.S. Possessions and Trust Territories * * @param string $countyId - * @return boolean + * @return bool */ protected function _isUSCountry($countyId) { @@ -440,7 +441,7 @@ protected function _isUSCountry($countyId) * Check is Canada * * @param string $countryId - * @return boolean + * @return bool */ protected function _isCanada($countryId) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php index eb4927013ad..764c05b53ae 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Abstract/Source/Mode.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php index 43bd97ffe16..222c8a3e7be 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Mode.php @@ -7,25 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shippers Modesource model * - * @category Mage - * @package Mage_Usa - * @author Magento Core Team + * @category Mage + * @package Mage_Usa + * @author Magento Core Team */ - class Mage_Usa_Model_Shipping_Carrier_Abstract_Source_Mode { /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php index 244e08c5b2d..cb593bbbc28 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Source/Requesttype.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index c6caa637898..6b70eb344a8 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -381,7 +382,7 @@ public function setRequest(Varien_Object $request) /** * Get result of request * - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getResult() { @@ -905,11 +906,7 @@ public function getCode($type, $code = '') return $codes[$type]; } - if (!isset($codes[$type][$code])) { - return false; - } else { - return $codes[$type][$code]; - } + return $codes[$type][$code] ?? false; } /** @@ -942,7 +939,7 @@ protected function _addRate($shipXml) } } - $data['term'] = (isset($services[$service]) ? $services[$service] : $desc); + $data['term'] = $services[$service] ?? $desc; $data['price_total'] = $this->getMethodPrice($totalEstimate, $service); $this->_dhlRates[] = ['service' => $service, 'data' => $data]; } @@ -952,7 +949,7 @@ protected function _addRate($shipXml) * Get tracking * * @param mixed $trackings - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getTracking($trackings) { @@ -1039,7 +1036,7 @@ protected function _getXMLTracking($trackings) /** * Parse xml tracking response * - * @param array $trackingvalue + * @param array $trackings * @param string $response * @return null */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php index 5e954e40bd2..e7cf1e74731 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Abstract.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php index 2e6daf64fcf..660bb408b6e 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DHL International (API v1.4) * - * @category Mage - * @package Mage_Usa - * @author Magento Core Team + * @category Mage + * @package Mage_Usa + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Dhl_International extends Mage_Usa_Model_Shipping_Carrier_Dhl_Abstract @@ -271,7 +272,7 @@ protected function _addParams($requestObject) * Prepare and set request in property of current instance * * @param Varien_Object $request - * @return Mage_Usa_Model_Shipping_Carrier_Dhl + * @return $this */ public function setRequest(Varien_Object $request) { @@ -452,11 +453,7 @@ public function getCode($type, $code = '') } $code = strtoupper($code); - if (!isset($codes[$type][$code])) { - return false; - } else { - return $codes[$type][$code]; - } + return $codes[$type][$code] ?? false; } /** @@ -528,7 +525,7 @@ public function getDhlProductTitle($code) { $contentType = $this->getConfigData('content_type'); $dhlProducts = $this->getDhlProducts($contentType); - return isset($dhlProducts[$code]) ? $dhlProducts[$code] : false; + return $dhlProducts[$code] ?? false; } /** @@ -773,7 +770,7 @@ protected function _addDimension($nodePiece) /** * Get shipping quotes * - * @return Mage_Core_Model_Abstract|Mage_Shipping_Model_Rate_Result + * @return Mage_Shipping_Model_Rate_Result */ protected function _getQuotes() { @@ -926,11 +923,7 @@ protected function _parseResponse($response) ) { $code = null; $data = null; - if (isset($xml->Response->Status->Condition)) { - $nodeCondition = $xml->Response->Status->Condition; - } else { - $nodeCondition = $xml->GetQuoteResponse->Note->Condition; - } + $nodeCondition = $xml->Response->Status->Condition ?? $xml->GetQuoteResponse->Note->Condition; if ($this->_isShippingLabelFlag) { foreach ($nodeCondition as $condition) { @@ -1097,10 +1090,8 @@ protected function _getWeightUnit() /** * Get Country Params by Country Code * - * @param string $countryCode + * @param string $countryCode ISO 3166 Codes (Countries) A2 * @return Varien_Object - * - * @see $countryCode ISO 3166 Codes (Countries) A2 */ protected function getCountryParams($countryCode) { @@ -1112,7 +1103,7 @@ protected function getCountryParams($countryCode) if (isset($this->_countryParams->$countryCode)) { $countryParams = new Varien_Object($this->_countryParams->$countryCode->asArray()); } - return isset($countryParams) ? $countryParams : new Varien_Object(); + return $countryParams ?? new Varien_Object(); } /** @@ -1134,7 +1125,7 @@ protected function _doShipmentRequest(Varien_Object $request) * Processing additional validation to check is carrier applicable. * * @param Mage_Shipping_Model_Rate_Request $request - * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|boolean + * @return Mage_Shipping_Model_Carrier_Abstract|Mage_Shipping_Model_Rate_Result_Error|bool */ public function proccessAdditionalValidation(Mage_Shipping_Model_Rate_Request $request) { @@ -1538,7 +1529,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '') * Get tracking * * @param mixed $trackings - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getTracking($trackings) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php index 66eec5cddd7..2b8fd92b666 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Contenttype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php index 4b9da4f438c..0949373526d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Doc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php index 881187dac20..37e6099ba15 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Doc.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php index fdda5ae515c..7c26427dfd1 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freedoc.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php index 16c78ed86c7..54e16843731 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Freenondoc.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Nondoc.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php index f1df1e1af26..3bd834e0430 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Nondoc.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Size.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International/Source/Method/Size.php index b54746333d0..5d65c72c116 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..ba7fc944056 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Label/Pdf.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php index a4d3375c9d3..2f44fc52426 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DHL International (API v1.4) Label Creation * * @deprecated now the process of creating the label is on DHL side - * @category Mage - * @package Mage_Usa - * @author Magento Core Team + * @category Mage + * @package Mage_Usa + * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php index a4e870d683e..16abf440d2f 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/Page.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DHL International (API v1.4) Label Creation * + * @category Mage + * @package Mage_Usa + * @author Magento Core Team * @deprecated now the process of creating the label is on DHL side - * @category Mage - * @package Mage_Usa - * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page extends Zend_Pdf_Page { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php index 23f2d249697..26c994376e0 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * DHL International (API v1.4) Label Creation * + * @category Mage + * @package Mage_Usa + * @author Magento Core Team * @deprecated now the process of creating the label is on DHL side - * @category Mage - * @package Mage_Usa - * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_PageBuilder { @@ -101,7 +102,7 @@ protected function _y($pt) /** * Add Border * - * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page + * @return $this */ public function addBorder() { @@ -212,7 +213,7 @@ public function addProductContentCode($code) * Add Unit Id * * @param int $id - * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page + * @return $this */ public function addUnitId($id) { @@ -228,7 +229,7 @@ public function addUnitId($id) * Add Reference Data * * @param $data - * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page + * @return $this */ public function addReferenceData($data) { @@ -439,7 +440,7 @@ public function addDeliveryDateCode() * Add Shipment Information * * @param Mage_Sales_Model_Order_Shipment $data - * @return Mage_Usa_Model_Shipping_Carrier_Dhl_Label_Pdf_Page + * @return $this * @throws InvalidArgumentException */ public function addShipmentInformation($data) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php index 63197ac1ac2..7fe049b30c5 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Dutypaymenttype.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php index 9569aae10fb..0f8c693763b 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Freemethod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php index 723cfe66bca..408849605c0 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Method.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Method { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php index 556c6cb6cb0..23d2ae4b24c 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Source/Protection/Rounding.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Protection_Rounding { public function toOptionArray() 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..80a21ea3f50 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 @@ -7,17 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..62265f25713 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php index 662d3212488..ccdb0b45a96 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -277,7 +278,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request) /** * Get result of request * - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getResult() { @@ -924,11 +925,7 @@ public function getCode($type, $code='') return $codes[$type]; } - if (!isset($codes[$type][$code])) { - return false; - } else { - return $codes[$type][$code]; - } + return $codes[$type][$code] ?? false; } /** @@ -956,14 +953,14 @@ public function getCurrencyCode () 'TWD' => 'NTD', // New Taiwan Dollars ]; $currencyCode = Mage::app()->getStore()->getBaseCurrencyCode(); - return isset($codes[$currencyCode]) ? $codes[$currencyCode] : $currencyCode; + return $codes[$currencyCode] ?? $currencyCode; } /** * Get tracking * * @param mixed $trackings - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getTracking($trackings) { @@ -1064,16 +1061,14 @@ protected function _parseTrackingResponse($trackingValue, $response) $trackInfo = $response->TrackDetails; $resultArray['status'] = (string)$trackInfo->StatusDescription; $resultArray['service'] = (string)$trackInfo->ServiceInfo; - $timestamp = isset($trackInfo->EstimatedDeliveryTimestamp) ? - $trackInfo->EstimatedDeliveryTimestamp : $trackInfo->ActualDeliveryTimestamp; + $timestamp = $trackInfo->EstimatedDeliveryTimestamp ?? $trackInfo->ActualDeliveryTimestamp; $timestamp = strtotime((string)$timestamp); if ($timestamp) { $resultArray['deliverydate'] = date('Y-m-d', $timestamp); $resultArray['deliverytime'] = date('H:i:s', $timestamp); } - $deliveryLocation = isset($trackInfo->EstimatedDeliveryAddress) ? - $trackInfo->EstimatedDeliveryAddress : $trackInfo->ActualDeliveryAddress; + $deliveryLocation = $trackInfo->EstimatedDeliveryAddress ?? $trackInfo->ActualDeliveryAddress; $deliveryLocationArray = []; if (isset($deliveryLocation->City)) { $deliveryLocationArray[] = (string)$deliveryLocation->City; diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php index f448711b944..c5dde6c0236 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Dropoff.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php index c13ee1e7a74..21b4d885a4f 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Freemethod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php index 49c1e273fff..5ad410154da 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Method.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php index a647bb755c4..83fb8f91a14 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Packaging.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex/Source/Unitofmeasure.php index 571aef27e4b..1a80f444886 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..dc2419efd5b 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,13 +24,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 * @@ -280,7 +280,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request) * Checks the current weight to comply with the minimum weight standards set by the carrier. * Then strictly rounds the weight up until the first significant digit after the decimal point. * - * @param float|integer|double $weight + * @param float|int $weight * @return float */ protected function _getCorrectWeight($weight) @@ -300,7 +300,7 @@ protected function _getCorrectWeight($weight) /** * Get result of request * - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getResult() { @@ -769,11 +769,7 @@ public function getCode($type, $code='') return $codes[$type]; } - if (!isset($codes[$type][$code])) { - return false; - } else { - return $codes[$type][$code]; - } + return $codes[$type][$code] ?? false; } /** @@ -964,7 +960,7 @@ protected function _getBaseCurrencyRate($code) /** * Prepare shipping rate result based on response * - * @param mixed $response + * @param mixed $xmlResponse * @return Mage_Shipping_Model_Rate_Result */ protected function _parseXmlResponse($xmlResponse) @@ -1061,7 +1057,7 @@ protected function _parseXmlResponse($xmlResponse) * Get tracking * * @param mixed $trackings - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getTracking($trackings) { @@ -1106,7 +1102,7 @@ protected function setXMLAccessRequest() * Get cgi tracking * * @param mixed $trackings - * @return mixed + * @return false|Mage_Core_Model_Abstract|Mage_Shipping_Model_Tracking_Result */ protected function _getCgiTracking($trackings) { @@ -1135,7 +1131,7 @@ protected function _getCgiTracking($trackings) * Get xml tracking * * @param mixed $trackings - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ protected function _getXmlTracking($trackings) { @@ -1191,7 +1187,7 @@ protected function _getXmlTracking($trackings) * Parse xml tracking response * * @param string $trackingvalue - * @param string $response + * @param string $xmlResponse * @return null */ protected function _parseXmlTrackingResponse($trackingvalue, $xmlResponse) @@ -1546,7 +1542,7 @@ protected function _formShipmentRequest(Varien_Object $request) /** * Send and process shipment accept request * - * @param SimpleXMLElement + * @param SimpleXMLElement $shipmentConfirmResponse * @return Varien_Object */ protected function _sendShipmentAcceptRequest(SimpleXMLElement $shipmentConfirmResponse) @@ -1722,7 +1718,7 @@ public function getContainerTypes(Varien_Object $params = null) /** * Return all container types of carrier * - * @return array|bool + * @return array */ public function getContainerTypesAll() { @@ -1750,7 +1746,7 @@ public function getContainerTypesFilter() * Return delivery confirmation types of carrier * * @param Varien_Object|null $params - * @return array|bool + * @return array */ public function getDeliveryConfirmationTypes(Varien_Object $params = null) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php index 52fc6152709..084a0bdb0c8 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php index dfc366028e3..31f97807865 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,6 @@ * @package Mage_Usa * @author Magento Core Team */ - class Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment extends Mage_Usa_Model_Shipping_Carrier_Abstract_Backend_Abstract { 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..232a7075528 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -25,7 +26,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/Container.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php index e58b58b95bb..5b66c31bcef 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Source/DestType.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php index 0e2b2ae1b9d..1148ab46d8d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/DestType.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php index ed83ae00ce2..628eb7ea1a9 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Freemethod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php index c0fa65e8c2f..bc4704025c1 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Method.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Method { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php index 8fcaec119e9..1bd685ee339 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Mode.php @@ -7,24 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * UPS (UPS XML) mode source model * + * @category Mage + * @package Mage_Usa + * @author Magento Core Team * @deprecated since 1.7.0.0 - * @category Mage - * @package Mage_Usa - * @author Magento Core Team */ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Mode { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php index fca4d56eec4..36bf1600bc8 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/OriginShipment.php @@ -7,22 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_OriginShipment { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php index 244c00e9024..203a397debd 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Pickup.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Pickup { public function toOptionArray() 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..867b5f294b2 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 @@ -7,22 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..cac36b32cc3 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..01e3eb5dc7e 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2017-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -24,7 +25,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 @@ -74,7 +75,7 @@ class Mage_Usa_Model_Shipping_Carrier_Usps /** * Destination Zip Code required flag * - * @var boolean + * @var bool * @deprecated since 1.7.0 functionality implemented in Mage_Usa_Model_Shipping_Carrier_Abstract */ protected $_isZipCodeRequired; @@ -263,7 +264,7 @@ public function setRequest(Mage_Shipping_Model_Rate_Request $request) /** * Get result of request * - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getResult() { @@ -512,11 +513,7 @@ protected function _parseXmlResponse($response) $rate->setCarrier('usps'); $rate->setCarrierTitle($this->getConfigData('title')); $rate->setMethod($method); - $rate->setMethodTitle( - isset($serviceCodeToActualNameMap[$method]) - ? $serviceCodeToActualNameMap[$method] - : $this->getCode('method', $method) - ); + $rate->setMethodTitle($serviceCodeToActualNameMap[$method] ?? $this->getCode('method', $method)); $rate->setCost($costArr[$method]); $rate->setPrice($price); $result->append($rate); @@ -895,17 +892,13 @@ public function getCode($type, $code = '') return $codes[$type]; } - if (!isset($codes[$type][$code])) { - return false; - } else { - return $codes[$type][$code]; - } + return $codes[$type][$code] ?? false; } /** * Get tracking * * @param mixed $trackingData - * @return mixed + * @return Mage_Shipping_Model_Rate_Result|null */ public function getTracking($trackingData) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php index 15e304c2ade..292b106d8ff 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Container.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Usps/Source/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php index ed19a2a80ae..1c8efdafe2a 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Freemethod.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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/Usps/Source/Machinable.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php index adec6ea258c..75580554e26 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Machinable.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Machinable { public function toOptionArray() diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php index 74d70bbaa9d..6a81053b368 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps/Source/Method.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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_Method { public function toOptionArray() 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..1354fcdd540 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 @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 35ad4acf477..76cf700a6e8 100644 --- a/app/code/core/Mage/Usa/etc/config.xml +++ b/app/code/core/Mage/Usa/etc/config.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @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 35546375376..4a0b034aad0 100644 --- a/app/code/core/Mage/Usa/etc/dhl/international/countries.xml +++ b/app/code/core/Mage/Usa/etc/dhl/international/countries.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. (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/Usa/etc/system.xml b/app/code/core/Mage/Usa/etc/system.xml index 9982521b8b0..ce5835877ad 100644 --- a/app/code/core/Mage/Usa/etc/system.xml +++ b/app/code/core/Mage/Usa/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/install-1.6.0.0.php b/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php index 52d43a13caa..cd94bbb246a 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/install-1.6.0.0.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php index 0cac476efe7..5dfd687a9f0 100644 --- a/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Usa/sql/usa_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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; // update UPS Gateway XML URL to the new recommended one $installer->run("UPDATE {$installer->getTable('core/config_data')} SET `value` = REPLACE(`value`, 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..515704593a6 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..f91b48f13bd 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 @@ -7,19 +7,21 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..3efec0a83e8 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 @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Usa + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..9c0babf515f 100644 --- a/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Element/Weee/Tax.php @@ -7,17 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..ee4c39b75da 100644 --- a/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php +++ b/app/code/core/Mage/Weee/Block/Renderer/Weee/Tax.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -23,7 +24,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 { @@ -126,7 +127,7 @@ public function getValues() * @param array $a * @param array $b * - * @return integer + * @return int */ protected function _sortWeeeTaxes($a, $b) { @@ -142,7 +143,7 @@ protected function _sortWeeeTaxes($a, $b) /** * Retrieves number of websites * - * @return integer + * @return int */ public function getWebsiteCount() { diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php index 6dd3b061eb6..f83aacea1e3 100644 --- a/app/code/core/Mage/Weee/Helper/Data.php +++ b/app/code/core/Mage/Weee/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -40,6 +41,8 @@ class Mage_Weee_Helper_Data extends Mage_Core_Helper_Abstract */ const LOADED_AND_DISPLAY_WITH_TAX = '2'; + protected $_moduleName = 'Mage_Weee'; + /** * Current store, in the case of backend order, it could be different from admin store * @@ -396,7 +399,7 @@ public function getOriginalAmount($product) * * @param Mage_Catalog_Model_Product $product * @param array $tierPrices - * @param boolean $includeIndex + * @param bool $includeIndex * @return $this */ public function processTierPrices($product, &$tierPrices, $includeIndex = true) @@ -470,7 +473,7 @@ public function getAmountInclTaxes($attributes) * Check if the configuration for the particular store causes conflicts * * @param Mage_Core_Model_Store|null $store - * @return boolean + * @return bool */ public function validateCatalogPricesAndFptConfiguration($store = null) { @@ -656,8 +659,7 @@ public function getRowWeeeAmountAfterDiscount($item) foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { $weeeAmountInclDiscount += $weeeTaxAppliedAmount['row_amount']; if (!$this->includeInSubtotal()) { - $weeeAmountInclDiscount -= isset($weeeTaxAppliedAmount['weee_discount']) - ? $weeeTaxAppliedAmount['weee_discount'] : 0; + $weeeAmountInclDiscount -= $weeeTaxAppliedAmount['weee_discount'] ?? 0; } } return $weeeAmountInclDiscount; @@ -678,8 +680,7 @@ public function getBaseRowWeeeAmountAfterDiscount($item) foreach ($weeeTaxAppliedAmounts as $weeeTaxAppliedAmount) { $baseWeeeAmountInclDiscount += $weeeTaxAppliedAmount['base_row_amount']; if (!$this->includeInSubtotal()) { - $baseWeeeAmountInclDiscount -= isset($weeeTaxAppliedAmount['base_weee_discount']) - ? $weeeTaxAppliedAmount['base_weee_discount'] : 0; + $baseWeeeAmountInclDiscount -= $weeeTaxAppliedAmount['base_weee_discount'] ?? 0; } } return $baseWeeeAmountInclDiscount; 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..10886415450 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 @@ -7,17 +7,17 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +27,7 @@ public static function getBackendModelName() { return 'weee/attribute_backend_weee_tax'; } + /** * Retrieve resource model * @@ -56,7 +57,7 @@ public function validate($object) continue; } - $state = isset($tax['state']) ? $tax['state'] : '*'; + $state = $tax['state'] ?? '*'; $key1 = implode('-', [$tax['website_id'], $tax['country'], $state]); if (!empty($dup[$key1])) { diff --git a/app/code/core/Mage/Weee/Model/Config/Source/Display.php b/app/code/core/Mage/Weee/Model/Config/Source/Display.php index 736418db793..bffa66d7438 100644 --- a/app/code/core/Mage/Weee/Model/Config/Source/Display.php +++ b/app/code/core/Mage/Weee/Model/Config/Source/Display.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ 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..6cfb2523b92 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 @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..65d2dbbb3d5 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c92d8bc46cc 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Setup.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..6886fc5c4c6 100644 --- a/app/code/core/Mage/Weee/Model/Mysql4/Tax.php +++ b/app/code/core/Mage/Weee/Model/Mysql4/Tax.php @@ -7,21 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Observer.php b/app/code/core/Mage/Weee/Model/Observer.php index 605e7bbc5da..9c11a47b642 100644 --- a/app/code/core/Mage/Weee/Model/Observer.php +++ b/app/code/core/Mage/Weee/Model/Observer.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Class Mage_Weee_Model_Observer * - * @category Mage - * @package Mage_Weee - * @author Magento Core Team + * @category Mage + * @package Mage_Weee + * @author Magento Core Team */ class Mage_Weee_Model_Observer extends Mage_Core_Model_Abstract { 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..e5c0ead43c2 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..60dc9109cf1 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Setup.php +++ b/app/code/core/Mage/Weee/Model/Resource/Setup.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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..57708dde258 100644 --- a/app/code/core/Mage/Weee/Model/Resource/Tax.php +++ b/app/code/core/Mage/Weee/Model/Resource/Tax.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..8b9b1f51f30 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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() */ @@ -90,8 +95,8 @@ public function __construct(array $args = []) * @param Mage_Customer_Model_Address_Abstract $shipping * @param Mage_Customer_Model_Address_Abstract $billing * @param mixed $website - * @param boolean $calculateTax - * @param boolean $ignoreDiscount + * @param bool $calculateTax + * @param bool $ignoreDiscount * @return float */ public function getWeeeAmount( @@ -120,7 +125,7 @@ public function getWeeeAmount( /** * Get a list of Weee attribute codes * - * @param boolean $forceEnabled + * @param bool $forceEnabled * @return array */ public function getWeeeAttributeCodes($forceEnabled = false) @@ -153,9 +158,9 @@ public function getWeeeTaxAttributeCodes($forceEnabled = false) * @param Mage_Sales_Model_Quote_Address $shipping * @param Mage_Sales_Model_Quote_Address $billing * @param int $website - * @param boolean $calculateTax - * @param boolean $ignoreDiscount - * @return array|\Varien_Object + * @param bool $calculateTax + * @param bool $ignoreDiscount + * @return array */ public function getProductWeeeAttributes( $product, 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..cf1187b671b 100644 --- a/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Creditmemo/Weee.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..7627be1eec4 100644 --- a/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Invoice/Weee.php @@ -7,17 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..73c13653f97 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 @@ -7,19 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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..eafff291d53 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 34cd8085fe9..3b9136448a9 100644 --- a/app/code/core/Mage/Weee/etc/config.xml +++ b/app/code/core/Mage/Weee/etc/config.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. (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/Weee/etc/system.xml b/app/code/core/Mage/Weee/etc/system.xml index 1976fe0a184..1e98bb50a58 100644 --- a/app/code/core/Mage/Weee/etc/system.xml +++ b/app/code/core/Mage/Weee/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php b/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php index 669155d54d5..23a695e2dbe 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/install-1.6.0.0.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Weee_Model_Resource_Setup $installer */ $installer = $this; $installer->startSetup(); + /** * Create table 'weee/tax' */ diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php index 03076b17b00..3632667d7a3 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-install-0.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php index 057edc96131..6029fe39105 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.1-0.2.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('weee_tax'), 'state', "varchar (255) not null default '*'"); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php index e91a4ab25fa..9b8fc34490b 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.10-0.11.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php index 62bd95f47d7..d6c5058e398 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.11-0.12.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('weee_tax'), 'entity_type_id', "smallint (5) unsigned not null"); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php index 53feebd6f48..35dcf1366eb 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.12-0.13.php @@ -7,19 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ +$installer = $this; $installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'weee_tax_applied_amount', 'decimal(12,4)'); $installer->getConnection()->modifyColumn($installer->getTable('sales/quote_item'), 'weee_tax_applied_row_amount', 'decimal(12,4)'); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php index 7c4ee2fbbe2..1c426077481 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.2-0.3.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addColumn($installer->getTable('weee_tax'), 'attribute_id', "smallint (5) unsigned not null"); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php index d3afbe005d7..0d2f3f7d666 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.3-0.4.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote_item', 'weee_tax_applied', ['type'=>'text']); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php index de42dc3719c..6cbe03df0a6 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.4-0.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote_item', 'weee_tax_applied_amount', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php index 3d32d0de1e3..b50e0f5f04d 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.5-0.6.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote_item', 'base_weee_tax_applied_amount', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php index 2abd407ae2a..d67cd8569d4 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.6-0.7.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('invoice_item', 'weee_tax_applied', ['type'=>'text']); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php index 35ef9cadd9e..c2b31ecd2d7 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.7-0.8.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->addConstraint('FK_WEEE_TAX_ATTRIBUTE_ID', $installer->getTable('weee_tax'), 'attribute_id', $installer->getTable('eav_attribute'), 'attribute_id'); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php index 3839dadc6ec..f51bc8a77e8 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.8-0.9.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->getConnection()->changeColumn( diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php index d066d4e0516..5c9eae050dd 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-0.9-0.10.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Weee_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->addAttribute('quote_item', 'weee_tax_disposition', ['type'=>'decimal']); diff --git a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index 9b28e2cbacb..437b354845e 100644 --- a/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Weee/sql/weee_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Weee + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @var Mage_Weee_Model_Resource_Setup $installer */ diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php index ba410949631..00dc2fea0d3 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget.php @@ -7,15 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Chooser.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php index c3d7175d1c1..ef1dbd39862 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Chooser.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Form.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php index a15e00a4d05..ef572d44552 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php index 1f6bcee6bad..1ab1e3ee144 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance grid 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 extends Mage_Adminhtml_Block_Widget_Grid_Container { diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php index c617a984acb..e82a47c2317 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Block.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php index e5762f7d105..7cca24e4988 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Block.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -241,7 +242,7 @@ protected function _collectBlocks() * Check whether given block match allowed block types * * @param Mage_Core_Model_Layout_Element $block - * @return boolean + * @return bool */ protected function _filterBlock($block) { diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php index d8644f4050d..bf145683c83 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance layouts chooser * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * * @method $this setArea(string $value) * @method $this setPackage(string $value) @@ -172,7 +173,7 @@ protected function _collectLayoutHandles($layoutHandles) * Check if given layout handle allowed (do not match not allowed patterns) * * @param string $layoutHandle - * @return boolean + * @return bool */ protected function _filterLayoutHandle($layoutHandle) { 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..723089e8601 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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/Form.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php index de0a9dffeb7..dc5ed5f1442 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Form.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Tab/Main.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php index 70a04ef3aa9..44e2125c929 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance Main 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_Main extends Mage_Adminhtml_Block_Widget_Form implements Mage_Adminhtml_Block_Widget_Tab_Interface { - /** - * Internal constructor - * - */ protected function _construct() { parent::_construct(); @@ -60,7 +57,7 @@ public function getTabTitle() /** * Returns status flag about this tab can be showen or not * - * @return true + * @return bool */ public function canShowTab() { @@ -70,7 +67,7 @@ public function canShowTab() /** * Returns status flag about this tab hidden or not * - * @return true + * @return false */ public function isHidden() { diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php index 93a31de1ce5..1b196b5d49e 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance page groups (predefined layouts group) to display on * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * * @method Mage_Widget_Model_Widget_Instance getWidgetInstance() * @method $this setWidgetInstance(Mage_Widget_Model_Widget_Instance $value) diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php index e0fb92bd9a7..ef2491238f8 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance Properties tab block * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team * * @method $this setWidgetType(string $value) * @method $this setWidgetValues(array $value) @@ -53,7 +54,7 @@ public function getTabTitle() /** * Returns status flag about this tab can be showen or not * - * @return true + * @return bool */ public function canShowTab() { @@ -63,7 +64,7 @@ public function canShowTab() /** * Returns status flag about this tab hidden or not * - * @return true + * @return false */ public function isHidden() { 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..25ff1aed038 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 @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -56,7 +57,7 @@ public function getTabTitle() /** * Returns status flag about this tab can be showen or not * - * @return true + * @return bool */ public function canShowTab() { @@ -66,7 +67,7 @@ public function canShowTab() /** * Returns status flag about this tab hidden or not * - * @return true + * @return false */ public function isHidden() { @@ -170,11 +171,11 @@ public function getTypesOptionsArray() * * @param array $a * @param array $b - * @return boolean + * @return int<-1, 1> */ protected function _sortWidgets($a, $b) { - return strcmp($a["label"], $b["label"]); + return strcmp($a['label'], $b['label']); } /** 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..071f6bf9327 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 @@ -7,30 +7,26 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @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/Block/Adminhtml/Widget/Instance/Grid.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php index 7f15785f6a2..6b823243f2a 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Grid.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Options.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php index 8fe84a20a9f..2c10a81d895 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -145,7 +146,7 @@ protected function _addField($parameter) ]; if ($values = $this->getWidgetValues()) { - $data['value'] = (isset($values[$fieldName]) ? $values[$fieldName] : ''); + $data['value'] = $values[$fieldName] ?? ''; } else { $data['value'] = $parameter->getValue(); //prepare unique id value diff --git a/app/code/core/Mage/Widget/Block/Interface.php b/app/code/core/Mage/Widget/Block/Interface.php index 020245acc12..184e4ccea5b 100644 --- a/app/code/core/Mage/Widget/Block/Interface.php +++ b/app/code/core/Mage/Widget/Block/Interface.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Block Interface * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ interface Mage_Widget_Block_Interface { diff --git a/app/code/core/Mage/Widget/Helper/Data.php b/app/code/core/Mage/Widget/Helper/Data.php index 55e370a3def..134273cece5 100644 --- a/app/code/core/Mage/Widget/Helper/Data.php +++ b/app/code/core/Mage/Widget/Helper/Data.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -25,4 +25,5 @@ */ class Mage_Widget_Helper_Data extends Mage_Core_Helper_Abstract { + protected $_moduleName = 'Mage_Widget'; } diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php index ced995c930d..5779723837e 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php index 3333992cba1..8a7583bbb76 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance Resource Model * - * @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_Instance extends Mage_Widget_Model_Resource_Widget_Instance diff --git a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php index 53508ef68a2..af72167a142 100644 --- a/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php +++ b/app/code/core/Mage/Widget/Model/Mysql4/Widget/Instance/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Observer.php b/app/code/core/Mage/Widget/Model/Observer.php index 9eb8a3e999f..74662702747 100644 --- a/app/code/core/Mage/Widget/Model/Observer.php +++ b/app/code/core/Mage/Widget/Model/Observer.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget.php b/app/code/core/Mage/Widget/Model/Resource/Widget.php index 14ffa3e170a..28f724d3d0f 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget.php @@ -7,31 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 37dde059aa0..dd784644471 100644 --- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance Resource Model * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team + * @category Mage + * @package Mage_Widget + * @author Magento Core Team */ 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..470d27c70e4 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 @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -34,10 +35,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(); @@ -47,8 +44,8 @@ protected function _construct() /** * Filter by store ids * - * @param array|integer $storeIds - * @param boolean $withDefaultStore if TRUE also filter by store id '0' + * @param array|int $storeIds + * @param bool $withDefaultStore if TRUE also filter by store id '0' * @return $this */ public function addStoreFilter($storeIds = [], $withDefaultStore = true) diff --git a/app/code/core/Mage/Widget/Model/Template/Filter.php b/app/code/core/Mage/Widget/Model/Template/Filter.php index b4456c37821..48ff1c85d24 100644 --- a/app/code/core/Mage/Widget/Model/Template/Filter.php +++ b/app/code/core/Mage/Widget/Model/Template/Filter.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -38,10 +39,7 @@ public function widgetDirective($construction) $params = $this->_getIncludeParameters($construction[2]); // Determine what name block should have in layout - $name = null; - if (isset($params['name'])) { - $name = $params['name']; - } + $name = $params['name'] ?? null; // validate required parameter type or id if (!empty($params['type'])) { diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php index 9147290f6b1..52e5d4a1c4c 100644 --- a/app/code/core/Mage/Widget/Model/Widget.php +++ b/app/code/core/Mage/Widget/Model/Widget.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 { @@ -289,11 +290,11 @@ protected function _idEncode($string) * * @param array $a * @param array $b - * @return boolean + * @return int<-1, 1> */ protected function _sortWidgets($a, $b) { - return strcmp($a["name"], $b["name"]); + return strcmp($a['name'], $b['name']); } /** diff --git a/app/code/core/Mage/Widget/Model/Widget/Config.php b/app/code/core/Mage/Widget/Model/Widget/Config.php index b72284ada20..9bea2497e70 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Config.php +++ b/app/code/core/Mage/Widget/Model/Widget/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_Widget - * @copyright Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php index 72d1110c14d..63098dac95e 100644 --- a/app/code/core/Mage/Widget/Model/Widget/Instance.php +++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Widget Instance Model * + * @category Mage + * @package Mage_Widget + * @author Magento Core Team + * * @method Mage_Widget_Model_Resource_Widget_Instance _getResource() * @method Mage_Widget_Model_Resource_Widget_Instance getResource() * @method Mage_Widget_Model_Resource_Widget_Instance_Collection getCollection() @@ -33,10 +38,6 @@ * @method $this setWidgetParameters(string $value) * @method int getSortOrder() * @method $this setSortOrder(int $value) - * - * @category Mage - * @package Mage_Widget - * @author Magento Core Team */ class Mage_Widget_Model_Widget_Instance extends Mage_Core_Model_Abstract { @@ -175,7 +176,7 @@ protected function _beforeSave() /** * Validate widget instance data * - * @return string|boolean + * @return string|bool */ public function validate() { @@ -188,7 +189,7 @@ public function validate() /** * Check if widget instance has required data (other data depends on it) * - * @return boolean + * @return bool */ public function isCompleteToCreate() { diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php index ea3b8a9b175..e7a4669b282 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** @@ -66,7 +67,7 @@ protected function _initAction() /** * Init widget instance object and set it to registry * - * @return Mage_Widget_Model_Widget_Instance|boolean + * @return Mage_Widget_Model_Widget_Instance|bool * @throws Mage_Core_Exception */ protected function _initWidgetInstance() diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php index 2c2dd9ee479..cab8aa6c4e8 100644 --- a/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php +++ b/app/code/core/Mage/Widget/controllers/Adminhtml/WidgetController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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 fb5a47fbb85..f43548529d1 100644 --- a/app/code/core/Mage/Widget/etc/adminhtml.xml +++ b/app/code/core/Mage/Widget/etc/adminhtml.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_Widget - * @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_Widget + * @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/Widget/etc/config.xml b/app/code/core/Mage/Widget/etc/config.xml index 9830c891a49..daadf1e9ca4 100644 --- a/app/code/core/Mage/Widget/etc/config.xml +++ b/app/code/core/Mage/Widget/etc/config.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_Widget - * @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_Widget + * @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/Widget/etc/jstranslator.xml b/app/code/core/Mage/Widget/etc/jstranslator.xml index b162ec7c0d5..9d8759d8061 100644 --- a/app/code/core/Mage/Widget/etc/jstranslator.xml +++ b/app/code/core/Mage/Widget/etc/jstranslator.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_Widget - * @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_Widget + * @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/Widget/sql/widget_setup/install-1.6.0.0.php b/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php index 3dd07230764..09d11089bcc 100644 --- a/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Widget/sql/widget_setup/install-1.6.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php index 5b9102693fa..c00fcd58e8c 100644 --- a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php +++ b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-install-1.4.0.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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->run(" diff --git a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index b955c211c4c..a5f6bd92d16 100644 --- a/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Widget/sql/widget_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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_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) + * @category Mage + * @package Mage_Widget + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Wishlist/Block/Abstract.php b/app/code/core/Mage/Wishlist/Block/Abstract.php index f215ce122ec..9edaa8b3572 100644 --- a/app/code/core/Mage/Wishlist/Block/Abstract.php +++ b/app/code/core/Mage/Wishlist/Block/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -242,7 +243,7 @@ public function hasDescription($item) } /** - * Retrieve formated Date + * Retrieve formatted Date * * @param string $date * @return string diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php index e6b0a718301..26f1d4d8984 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sharing.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..c6211acf500 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Sidebar.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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..98f2c1c0be5 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Button.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php index e368bd084e5..8760fb93359 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Button.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Item/Column.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php index 7a471736034..0b2fc15710b 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -30,7 +31,7 @@ class Mage_Wishlist_Block_Customer_Wishlist_Item_Column extends Mage_Wishlist_Bl /** * Checks whether column should be shown in table * - * @return bool + * @return true */ public function isEnabled() { @@ -55,7 +56,6 @@ protected function _toHtml() * * @param string $name * @param Mage_Core_Block_Abstract $child - * @return string */ protected function _beforeChildToHtml($name, $child) { diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php index 63ad394dd28..dac09cfed19 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Item/Column/Comment.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php index 4d5e2dc7af2..3162563d588 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @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/Item/Column/Image.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php index f9fe26875f2..38296cb8fdb 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php @@ -7,14 +7,14 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) * @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/Item/Column/Remove.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php index 7bb95cafe93..2ec2223ae60 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Delete item column in customer wishlist table * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Remove extends Mage_Wishlist_Block_Customer_Wishlist_Item_Column { diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php index 0ac2b55205d..5e6092319fb 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Items.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php index 9b94355225c..6177f2e330b 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist block customer items * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Block_Customer_Wishlist_Items extends Mage_Core_Block_Template { diff --git a/app/code/core/Mage/Wishlist/Block/Item/Configure.php b/app/code/core/Mage/Wishlist/Block/Item/Configure.php index 26d6f840002..6be37a0b9bd 100644 --- a/app/code/core/Mage/Wishlist/Block/Item/Configure.php +++ b/app/code/core/Mage/Wishlist/Block/Item/Configure.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2020 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php index e349b462f2f..84b8c278530 100644 --- a/app/code/core/Mage/Wishlist/Block/Links.php +++ b/app/code/core/Mage/Wishlist/Block/Links.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Links block * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Block_Links extends Mage_Page_Block_Template_Links_Block { diff --git a/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php b/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php index be260e3f014..77aba13aa34 100644 --- a/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php +++ b/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Email/Items.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php index a4a88ad2bbc..cd68f8f0f93 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Email/Rss.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php index 2c22d629867..9c5209b7593 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..d2957466613 100644 --- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php index 61af2131f28..e027bf8ee30 100644 --- a/app/code/core/Mage/Wishlist/Controller/Abstract.php +++ b/app/code/core/Mage/Wishlist/Controller/Abstract.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php index 4f3a22943cd..d9b527fa21c 100644 --- a/app/code/core/Mage/Wishlist/Helper/Data.php +++ b/app/code/core/Mage/Wishlist/Helper/Data.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -35,6 +36,8 @@ class Mage_Wishlist_Helper_Data extends Mage_Core_Helper_Abstract */ const XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK = 'cataloginventory/options/show_out_of_stock'; + protected $_moduleName = 'Mage_Wishlist'; + /** * Currently logged in customer * diff --git a/app/code/core/Mage/Wishlist/Model/Config.php b/app/code/core/Mage/Wishlist/Model/Config.php index cbfb60cf3a4..8f3985ec14d 100644 --- a/app/code/core/Mage/Wishlist/Model/Config.php +++ b/app/code/core/Mage/Wishlist/Model/Config.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) * @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..7b177e43693 100644 --- a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php +++ b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php @@ -7,15 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php index 320c09100f6..a3fc21681c8 100644 --- a/app/code/core/Mage/Wishlist/Model/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Item.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist item model * + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team + * * @method Mage_Wishlist_Model_Resource_Item _getResource() * @method Mage_Wishlist_Model_Resource_Item getResource() * @method Mage_Wishlist_Model_Resource_Item_Collection getCollection() @@ -41,10 +46,6 @@ * @method int getWishlistId() * @method $this setWishlistId(int $value)Mage_Wishlist_Model_Resource_Item * @method $this setWishlist(Mage_Wishlist_Model_Wishlist $param) - * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team */ class Mage_Wishlist_Model_Item extends Mage_Core_Model_Abstract implements Mage_Catalog_Model_Product_Configuration_Item_Interface { @@ -109,10 +110,6 @@ class Mage_Wishlist_Model_Item extends Mage_Core_Model_Abstract implements Mage_ */ protected $_flagOptionsSaved = null; - /** - * Initialize resource model - * - */ protected function _construct() { $this->_cacheTag = 'wishlist_item'; @@ -172,7 +169,7 @@ protected function _addOptionCode($option) * Checks that item model has data changes. * Call save item options if model isn't need to save in DB * - * @return boolean + * @return bool */ protected function _hasModelChanged() { diff --git a/app/code/core/Mage/Wishlist/Model/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Item/Option.php index 0c41989494c..da19d23794a 100644 --- a/app/code/core/Mage/Wishlist/Model/Item/Option.php +++ b/app/code/core/Mage/Wishlist/Model/Item/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Item option model * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team * * @method Mage_Wishlist_Model_Resource_Item_Option_Collection getCollection() * @method string getCode() @@ -38,9 +39,6 @@ class Mage_Wishlist_Model_Item_Option extends Mage_Core_Model_Abstract implement protected $_item; protected $_product; - /** - * Initialize resource model - */ protected function _construct() { $this->_init('wishlist/item_option'); @@ -49,7 +47,7 @@ protected function _construct() /** * Checks that item option model has data changes * - * @return boolean + * @return bool */ protected function _hasModelChanged() { diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php index c0ded335f99..ef70217f85f 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist item 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_Item extends Mage_Wishlist_Model_Resource_Item diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php index fdeec754037..9b8177f0667 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php index f82035b16a6..b5b2fe7d2a4 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Item option mysql4 resource model * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team * @deprecated */ class Mage_Wishlist_Model_Mysql4_Item_Option extends Mage_Wishlist_Model_Resource_Item_Option diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php index 8f89792e210..c1ad899596c 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php index 99af7d4c9a4..5955536e86a 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php index 8ea6b394191..36b582ffcca 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php index 7b61cec3fd4..8f0ca3a08a6 100644 --- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php index 72f4446aa4a..417ce0fbfc6 100644 --- a/app/code/core/Mage/Wishlist/Model/Observer.php +++ b/app/code/core/Mage/Wishlist/Model/Observer.php @@ -7,21 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2018-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Shopping cart operation observer * - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ class Mage_Wishlist_Model_Observer extends Mage_Core_Model_Abstract { diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item.php b/app/code/core/Mage/Wishlist/Model/Resource/Item.php index b85945b10c6..8be6d9fe87e 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item.php @@ -7,30 +7,27 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist item model resource * - * @category Mage - * @package Mage_Wishlist - * @author Magento Core Team + * @category Mage + * @package Mage_Wishlist + * @author Magento Core Team */ 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/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php index e7fa28bfb1d..a14d74b464d 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -68,7 +69,7 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou /** * Add days in whishlist filter of product collection * - * @var boolean + * @var bool */ protected $_addDaysInWishlist = false; @@ -82,7 +83,7 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou /** * Whether product name attribute value table is joined in select * - * @var boolean + * @var bool */ protected $_isProductNameJoined = false; @@ -100,9 +101,6 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou */ protected $_customerGroupId = null; - /** - * Initialize resource model for collection - */ public function _construct() { $this->_init('wishlist/item'); @@ -204,6 +202,7 @@ protected function _assignProducts() $checkInStock = $this->_productInStock && !Mage::helper('cataloginventory')->isShowOutOfStock(); foreach ($this as $item) { + /** @var Mage_Catalog_Model_Product $product */ $product = $productCollection->getItemById($item->getProductId()); if ($product) { if ($checkInStock && !$product->isInStock()) { diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php index 9fd35ecd296..caf9fa65112 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php @@ -7,23 +7,23 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ /** * Wishlist item option 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_Item_Option extends Mage_Core_Model_Resource_Db_Abstract { diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php index a5d4df563ff..0248afd879b 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php index 234875270ae..7667a910d79 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -33,7 +34,7 @@ class Mage_Wishlist_Model_Resource_Product_Collection extends Mage_Catalog_Model /** * Add days in whishlist filter of product collection * - * @var boolean + * @var bool */ protected $_addDaysInWishlist = false; @@ -46,7 +47,7 @@ class Mage_Wishlist_Model_Resource_Product_Collection extends Mage_Catalog_Model /** * Get add days in whishlist filter of product collection flag * - * @return boolean + * @return bool */ public function getDaysInWishlist() { diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php index 29f03b67ad4..6ae56aac622 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Resource/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php index a0b3f83e920..5b476323bc8 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/Model/Session.php b/app/code/core/Mage/Wishlist/Model/Session.php index 11389a654ad..bf4eddfe033 100644 --- a/app/code/core/Mage/Wishlist/Model/Session.php +++ b/app/code/core/Mage/Wishlist/Model/Session.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020 The OpenMage Contributors (https://www.openmage.org) + * @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..14920bb601d 100644 --- a/app/code/core/Mage/Wishlist/Model/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php @@ -7,20 +7,25 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @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 +37,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/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php index 00060e88f26..3c028a4108d 100644 --- a/app/code/core/Mage/Wishlist/controllers/IndexController.php +++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php @@ -7,14 +7,15 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ @@ -47,7 +48,7 @@ class Mage_Wishlist_IndexController extends Mage_Wishlist_Controller_Abstract /** * Extend preDispatch * - * @return Mage_Core_Controller_Front_Action|void + * @return void */ public function preDispatch() { @@ -175,7 +176,7 @@ public function addAction() /** * Add the item to wish list * - * @return Mage_Core_Controller_Varien_Action|void + * @return void */ protected function _addItemToWishList() { @@ -317,7 +318,7 @@ public function updateItemOptionsAction() try { $id = (int) $this->getRequest()->getParam('id'); - /** @var Mage_Wishlist_Model_Item */ + /** @var Mage_Wishlist_Model_Item $item */ $item = Mage::getModel('wishlist/item'); $item->load($id); $wishlist = $this->_getWishlist($item->getWishlistId()); @@ -495,11 +496,7 @@ public function cartAction() // Set qty $qty = $this->getRequest()->getParam('qty'); if (is_array($qty)) { - if (isset($qty[$itemId])) { - $qty = $qty[$itemId]; - } else { - $qty = 1; - } + $qty = $qty[$itemId] ?? 1; } $qty = (float)$qty; if ($qty && $qty>0) { diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php index 5f3d4e9df81..df49a0adc73 100644 --- a/app/code/core/Mage/Wishlist/controllers/SharedController.php +++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php @@ -7,23 +7,24 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/adminhtml.xml b/app/code/core/Mage/Wishlist/etc/adminhtml.xml index 6bc9ebde503..4342d91ad2b 100644 --- a/app/code/core/Mage/Wishlist/etc/adminhtml.xml +++ b/app/code/core/Mage/Wishlist/etc/adminhtml.xml @@ -8,15 +8,17 @@ * 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 + * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml index 56feee522f6..5068144d565 100644 --- a/app/code/core/Mage/Wishlist/etc/config.xml +++ b/app/code/core/Mage/Wishlist/etc/config.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. (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/Wishlist/etc/system.xml b/app/code/core/Mage/Wishlist/etc/system.xml index 1eb4813fdb4..2a535dd4ea9 100644 --- a/app/code/core/Mage/Wishlist/etc/system.xml +++ b/app/code/core/Mage/Wishlist/etc/system.xml @@ -8,15 +8,16 @@ * 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. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php s+Academic Free License (AFL 3.0) */ --> diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php index 244e2b31984..5a0e2d79130 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); /** diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php index 973c897ec55..ef30efd5868 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php index f25628ada81..cca945e07dc 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php index 1677dc1c148..8ab8a3b758f 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * FOREIGN KEY update - * * @category Mage * @package Mage_Wishlist - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $installer->run(" @@ -40,4 +32,5 @@ ON UPDATE CASCADE ON DELETE CASCADE; "); + $installer->endSetup(); diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php index dd095cf205a..6123d6cad66 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php @@ -7,28 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) - */ - -/** - * Add foreign key to customers table into wishlists - * * @category Mage * @package Mage_Wishlist - * @author Magento Core Team + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -$installer = $this; /** @var Mage_Core_Model_Resource_Setup $installer */ - +$installer = $this; $installer->startSetup(); $tableWishlist = $this->getTable('wishlist'); diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php index 5dc99294032..228a78e063c 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php @@ -7,20 +7,20 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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($installer->getTable('wishlist/item'), 'FK_WISHLIST_ITEM_STORE'); diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php index 189ef73b00e..70e4535cad9 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php @@ -7,13 +7,13 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php index c7da6acdd16..0f1771eb92e 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php index c96b934bd97..64a20b83672 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php index 63cfc1b2dda..9ee7b28476d 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php @@ -7,20 +7,22 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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()->addColumn($this->getTable('wishlist/item'), 'qty', 'DECIMAL( 12, 4 ) NOT NULL'); $installer->run(" diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php index f9e5855c211..176823fe32c 100644 --- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php @@ -7,15 +7,16 @@ * This source file is subject to the Open Software License (OSL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: - * http://opensource.org/licenses/osl-3.0.php + * https://opensource.org/licenses/osl-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/osl-3.0.php Open Software License (OSL 3.0) + * @category Mage + * @package Mage_Wishlist + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @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/Zend/Db/Select.php b/app/code/core/Zend/Db/Select.php index a24aee6627d..1ed07515547 100644 --- a/app/code/core/Zend/Db/Select.php +++ b/app/code/core/Zend/Db/Select.php @@ -39,10 +39,8 @@ * @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'; const COLUMNS = 'columns'; const FROM = 'from'; @@ -1388,5 +1386,4 @@ public function __toString() } return (string)$sql; } - } 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 diff --git a/app/design/adminhtml/default/default/etc/theme.xml b/app/design/adminhtml/default/default/etc/theme.xml index f42ea85a77f..d449bc27129 100644 --- a/app/design/adminhtml/default/default/etc/theme.xml +++ b/app/design/adminhtml/default/default/etc/theme.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/admin.xml b/app/design/adminhtml/default/default/layout/admin.xml index 5119acabe42..4abf96d925a 100644 --- a/app/design/adminhtml/default/default/layout/admin.xml +++ b/app/design/adminhtml/default/default/layout/admin.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/adminnotification.xml b/app/design/adminhtml/default/default/layout/adminnotification.xml index bd9a2adeeea..71d6735a1b5 100644 --- a/app/design/adminhtml/default/default/layout/adminnotification.xml +++ b/app/design/adminhtml/default/default/layout/adminnotification.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/api2.xml b/app/design/adminhtml/default/default/layout/api2.xml index e8f0f418edc..81ab7935327 100644 --- a/app/design/adminhtml/default/default/layout/api2.xml +++ b/app/design/adminhtml/default/default/layout/api2.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/authorizenet.xml b/app/design/adminhtml/default/default/layout/authorizenet.xml index 71bd711bcdb..ad2babb327c 100644 --- a/app/design/adminhtml/default/default/layout/authorizenet.xml +++ b/app/design/adminhtml/default/default/layout/authorizenet.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/bundle.xml b/app/design/adminhtml/default/default/layout/bundle.xml index 7e11b3b7048..04fc6777100 100644 --- a/app/design/adminhtml/default/default/layout/bundle.xml +++ b/app/design/adminhtml/default/default/layout/bundle.xml @@ -8,15 +8,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/captcha.xml b/app/design/adminhtml/default/default/layout/captcha.xml index 1b63c86af6f..e8c1c373d55 100644 --- a/app/design/adminhtml/default/default/layout/captcha.xml +++ b/app/design/adminhtml/default/default/layout/captcha.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/catalog.xml b/app/design/adminhtml/default/default/layout/catalog.xml index 94c5dccc72e..5e174824b3d 100644 --- a/app/design/adminhtml/default/default/layout/catalog.xml +++ b/app/design/adminhtml/default/default/layout/catalog.xml @@ -8,15 +8,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2016-2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/centinel.xml b/app/design/adminhtml/default/default/layout/centinel.xml index cca16b6d943..73721bf9787 100644 --- a/app/design/adminhtml/default/default/layout/centinel.xml +++ b/app/design/adminhtml/default/default/layout/centinel.xml @@ -8,15 +8,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/cms.xml b/app/design/adminhtml/default/default/layout/cms.xml index 2c49a135d3a..bf4fd479683 100644 --- a/app/design/adminhtml/default/default/layout/cms.xml +++ b/app/design/adminhtml/default/default/layout/cms.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/currencysymbol.xml b/app/design/adminhtml/default/default/layout/currencysymbol.xml index fe5ed019bc4..a8f3cc544f0 100644 --- a/app/design/adminhtml/default/default/layout/currencysymbol.xml +++ b/app/design/adminhtml/default/default/layout/currencysymbol.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/default/default/layout/customer.xml index 3a7d528493c..d85fa2fae22 100644 --- a/app/design/adminhtml/default/default/layout/customer.xml +++ b/app/design/adminhtml/default/default/layout/customer.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/dataflow.xml b/app/design/adminhtml/default/default/layout/dataflow.xml index 212517ae189..3e3119f4c14 100644 --- a/app/design/adminhtml/default/default/layout/dataflow.xml +++ b/app/design/adminhtml/default/default/layout/dataflow.xml @@ -8,15 +8,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/downloadable.xml b/app/design/adminhtml/default/default/layout/downloadable.xml index 751ed760622..8d14299833d 100644 --- a/app/design/adminhtml/default/default/layout/downloadable.xml +++ b/app/design/adminhtml/default/default/layout/downloadable.xml @@ -8,15 +8,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/giftmessage.xml b/app/design/adminhtml/default/default/layout/giftmessage.xml index 0691670efd0..2a71e1d1da8 100644 --- a/app/design/adminhtml/default/default/layout/giftmessage.xml +++ b/app/design/adminhtml/default/default/layout/giftmessage.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/importexport.xml b/app/design/adminhtml/default/default/layout/importexport.xml index 91e52795a04..d1b31c41126 100644 --- a/app/design/adminhtml/default/default/layout/importexport.xml +++ b/app/design/adminhtml/default/default/layout/importexport.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/index.xml b/app/design/adminhtml/default/default/layout/index.xml index 6daf0d50345..3ac9a8454ee 100644 --- a/app/design/adminhtml/default/default/layout/index.xml +++ b/app/design/adminhtml/default/default/layout/index.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml index 7128676018f..389a6e16c25 100644 --- a/app/design/adminhtml/default/default/layout/main.xml +++ b/app/design/adminhtml/default/default/layout/main.xml @@ -8,15 +8,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ diff --git a/app/design/adminhtml/default/default/layout/newsletter.xml b/app/design/adminhtml/default/default/layout/newsletter.xml index edb6cd56883..f4cb8fd747f 100644 --- a/app/design/adminhtml/default/default/layout/newsletter.xml +++ b/app/design/adminhtml/default/default/layout/newsletter.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/oauth.xml b/app/design/adminhtml/default/default/layout/oauth.xml index 74a328dea78..42f5370d758 100644 --- a/app/design/adminhtml/default/default/layout/oauth.xml +++ b/app/design/adminhtml/default/default/layout/oauth.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/promo.xml b/app/design/adminhtml/default/default/layout/promo.xml index 1225c318a6a..1e58a62843e 100644 --- a/app/design/adminhtml/default/default/layout/promo.xml +++ b/app/design/adminhtml/default/default/layout/promo.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/report.xml b/app/design/adminhtml/default/default/layout/report.xml index 6f6e55d49ae..909c5ee9976 100644 --- a/app/design/adminhtml/default/default/layout/report.xml +++ b/app/design/adminhtml/default/default/layout/report.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/rss.xml b/app/design/adminhtml/default/default/layout/rss.xml index aeaf9aefd50..aa856f7c208 100644 --- a/app/design/adminhtml/default/default/layout/rss.xml +++ b/app/design/adminhtml/default/default/layout/rss.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/default/default/layout/sales.xml index 1ab95906fb8..215806b4b3b 100644 --- a/app/design/adminhtml/default/default/layout/sales.xml +++ b/app/design/adminhtml/default/default/layout/sales.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> @@ -485,9 +485,11 @@ + + @@ -632,7 +634,6 @@ - @@ -1051,22 +1052,29 @@ + + + + + + + diff --git a/app/design/adminhtml/default/default/layout/search.xml b/app/design/adminhtml/default/default/layout/search.xml index c37c829f3d5..43f87dd2d95 100644 --- a/app/design/adminhtml/default/default/layout/search.xml +++ b/app/design/adminhtml/default/default/layout/search.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/tag.xml b/app/design/adminhtml/default/default/layout/tag.xml index baf7afdfa26..059392c7607 100644 --- a/app/design/adminhtml/default/default/layout/tag.xml +++ b/app/design/adminhtml/default/default/layout/tag.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/tax.xml b/app/design/adminhtml/default/default/layout/tax.xml index ebf083988bf..66911bf14f9 100644 --- a/app/design/adminhtml/default/default/layout/tax.xml +++ b/app/design/adminhtml/default/default/layout/tax.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/layout/widget.xml b/app/design/adminhtml/default/default/layout/widget.xml index 3e9a5f7e441..2d202385e49 100644 --- a/app/design/adminhtml/default/default/layout/widget.xml +++ b/app/design/adminhtml/default/default/layout/widget.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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> diff --git a/app/design/adminhtml/default/default/template/access_denied.phtml b/app/design/adminhtml/default/default/template/access_denied.phtml index c9cf6146940..a80506ee3a1 100644 --- a/app/design/adminhtml/default/default/template/access_denied.phtml +++ b/app/design/adminhtml/default/default/template/access_denied.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml index 248b44f35f5..1f195fd9c47 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml index b18e8648c5d..d08e1dbf1cf 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml index 729fba7885a..ea8abc94fe2 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> //'+ +var linkTemplate = ''+ ''+ ''+ ''+ @@ -310,6 +311,11 @@ var linkItems = { this.itemCount++; this.togglePriceFields(); this.bindRemoveButtons(); + + var inputs = $$('#downloadable_link_' + data.id + ' input'); + inputs.each(function(el) { Event.observe(el, 'change', el.setHasChanges.bind(el)); } ) + var inputs = $$('#downloadable_link_' + data.id + ' button.delete'); + inputs.each(function(el) { Event.observe(el, 'click', el.setHasChanges.bind(el)); } ) }, remove : function(event){ var element = $(Event.findElement(event, 'tr')); diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml index 5ac04e6a153..b53052a66cc 100644 --- a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml +++ b/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getCssJsHtml() ?> -getCanLoadExtJs()): ?> +getCanLoadExtJs()): ?> -getCanLoadTinyMce()): // TinyMCE is broken when loaded through index.php ?> +getCanLoadTinyMce()): // TinyMCE is broken when loaded through index.php?> diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/default/default/template/page/header.phtml index 6086f1a05be..f775d7accad 100644 --- a/app/design/adminhtml/default/default/template/page/header.phtml +++ b/app/design/adminhtml/default/default/template/page/header.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Adminhtml_Block_Page_Header */ diff --git a/app/design/adminhtml/default/default/template/page/js/calendar.phtml b/app/design/adminhtml/default/default/template/page/js/calendar.phtml index 9ad9fe64247..ff8b21aca65 100644 --- a/app/design/adminhtml/default/default/template/page/js/calendar.phtml +++ b/app/design/adminhtml/default/default/template/page/js/calendar.phtml @@ -7,15 +7,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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page/js/translate.phtml b/app/design/adminhtml/default/default/template/page/js/translate.phtml index ab86ffe0a14..da14592c9bc 100644 --- a/app/design/adminhtml/default/default/template/page/js/translate.phtml +++ b/app/design/adminhtml/default/default/template/page/js/translate.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/page/menu.phtml b/app/design/adminhtml/default/default/template/page/menu.phtml index dd0d92e47b6..d46c0d01732 100644 --- a/app/design/adminhtml/default/default/template/page/menu.phtml +++ b/app/design/adminhtml/default/default/template/page/menu.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** @var $this Mage_Adminhtml_Block_Page_Menu */ diff --git a/app/design/adminhtml/default/default/template/page/notices.phtml b/app/design/adminhtml/default/default/template/page/notices.phtml index c32562f60d1..63248d24da1 100644 --- a/app/design/adminhtml/default/default/template/page/notices.phtml +++ b/app/design/adminhtml/default/default/template/page/notices.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getPartialAuthorizationFormMessage(); ?> diff --git a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml index 805c71394a8..f358f52c4a7 100644 --- a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml +++ b/app/design/adminhtml/default/default/template/paygate/info/cc.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml index a0590bc3c74..85cf5e1c067 100644 --- a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml +++ b/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2019-2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml b/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml index 30b3daf9f3a..eddc96621ef 100644 --- a/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getInstructions()): ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml b/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml index ac265536070..039f98e6eaf 100644 --- a/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ /** diff --git a/app/design/adminhtml/default/default/template/payment/form/cc.phtml b/app/design/adminhtml/default/default/template/payment/form/cc.phtml index f4e8f5d3304..6ff983df375 100644 --- a/app/design/adminhtml/default/default/template/payment/form/cc.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/cc.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethodCode() ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml index 9216ef39092..f8049f6b76c 100644 --- a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> getMethodCode() ?> diff --git a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml index 7018483760d..a08e488c1c8 100644 --- a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml +++ b/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml @@ -7,15 +7,16 @@ * 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 design * @package default_default - * @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) + * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) + * @copyright Copyright (c) 2021 The OpenMage Contributors (https://www.openmage.org) + * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?>