Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Forward port #2810 #2885

Closed
wants to merge 2 commits into from
Closed

Forward port #2810 #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a354a
Some code alignments between v19 and v20 (#2810)
sreichel Dec 16, 2022
91c3b9c
Comments by @tmotyl
fballiano Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/code/core/Mage/Sales/Model/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,37 +446,37 @@ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract
protected $_addresses = null;

/**
* @var Mage_Sales_Model_Resource_Order_Item_Collection|Mage_Sales_Model_Order_Item[]|null
* @var Mage_Sales_Model_Resource_Order_Item_Collection|Mage_Sales_Model_Order_Item[]
*/
protected $_items = null;

/**
* @var Mage_Sales_Model_Resource_Order_Payment_Collection|Mage_Sales_Model_Order_Payment[]|null
* @var Mage_Sales_Model_Resource_Order_Payment_Collection|Mage_Sales_Model_Order_Payment[]
*/
protected $_payments = null;

/**
* @var Mage_Sales_Model_Resource_Order_Status_History_Collection|Mage_Sales_Model_Order_Status_History[]|null
* @var Mage_Sales_Model_Resource_Order_Status_History_Collection|Mage_Sales_Model_Order_Status_History[]
*/
protected $_statusHistory = null;

/**
* @var Mage_Sales_Model_Resource_Order_Invoice_Collection|null
* @var Mage_Sales_Model_Resource_Order_Invoice_Collection
*/
protected $_invoices;

/**
* @var Mage_Sales_Model_Resource_Order_Shipment_Track_Collection|null
* @var Mage_Sales_Model_Resource_Order_Shipment_Track_Collection
*/
protected $_tracks;

/**
* @var Mage_Sales_Model_Resource_Order_Shipment_Collection|false|null
* @var Mage_Sales_Model_Resource_Order_Shipment_Collection|false
*/
protected $_shipments;

/**
* @var Mage_Sales_Model_Resource_Order_Creditmemo_Collection|Mage_Sales_Model_Order_Creditmemo[]|false|null
* @var Mage_Sales_Model_Resource_Order_Creditmemo_Collection|Mage_Sales_Model_Order_Creditmemo[]|false
*/
protected $_creditmemos;

Expand Down Expand Up @@ -1745,7 +1745,7 @@ public function getAllVisibleItems()
$items = [];
foreach ($this->getItemsCollection() as $item) {
if (!$item->isDeleted() && !$item->getParentItemId()) {
$items[] = $item;
fballiano marked this conversation as resolved.
Show resolved Hide resolved
$items[] = $item;
}
}
return $items;
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Order/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ protected function _construct()
* Init mapping array of short fields to its full names
*
* @return $this
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Order/Creditmemo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ protected function _construct()
* Init mapping array of short fields to its full names
*
* @return $this
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Order/Invoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ protected function _construct()
* Init mapping array of short fields to its full names
*
* @return $this
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
8 changes: 2 additions & 6 deletions app/code/core/Mage/Sales/Model/Order/Invoice/Item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,10 @@ class Mage_Sales_Model_Order_Invoice_Item extends Mage_Core_Model_Abstract
protected $_eventPrefix = 'sales_invoice_item';
protected $_eventObject = 'invoice_item';

/**
* @var Mage_Sales_Model_Order_Invoice
*/
/** @var Mage_Sales_Model_Order_Invoice */
protected $_invoice = null;

/**
* @var Mage_Sales_Model_Order_Item|null
*/
/** @var Mage_Sales_Model_Order_Item */
protected $_orderItem = null;

public function _construct()
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Model/Order/Item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ class Mage_Sales_Model_Order_Item extends Mage_Core_Model_Abstract
* @var Mage_Sales_Model_Order|null
*/
protected $_order = null;

protected $_parentItem = null;
protected $_children = [];

Expand All @@ -238,6 +237,7 @@ protected function _construct()
* its full names
*
* @return Varien_Object
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Order/Shipment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ protected function _construct()
* Init mapping array of short fields to its full names
*
* @return $this
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Quote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ protected function _construct()
* its full names
*
* @return Varien_Object
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Quote/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ protected function _construct()
* Init mapping array of short fields to its full names
*
* @return $this
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Sales/Model/Quote/Item.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ protected function _construct()
* its full names
*
* @return $this
* @deprecated
*/
protected function _initOldFieldsMap()
{
Expand Down