Skip to content

Commit

Permalink
Fixed issue OpenMage#3392 clearInstance() method in Mage_Catalog_Mode…
Browse files Browse the repository at this point in the history
…l_Product. (OpenMage#3395)

* Fixed issue OpenMage#3392 clearInstance() method in Mage_Catalog_Model_Product.

* PHPStan

* whitespace

* PHPStan

---------

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
  • Loading branch information
kiatng and fballiano authored Jul 21, 2023
1 parent 8572935 commit 4840185
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 23 deletions.
35 changes: 22 additions & 13 deletions app/code/core/Mage/Catalog/Model/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
/**
* Product type instance
*
* @var Mage_Catalog_Model_Product_Type_Abstract
* @var Mage_Catalog_Model_Product_Type_Abstract|null|false
*/
protected $_typeInstance = null;

Expand All @@ -282,7 +282,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
/**
* Product link instance
*
* @var Mage_Catalog_Model_Product_Link
* @var Mage_Catalog_Model_Product_Link|null
*/
protected $_linkInstance;

Expand All @@ -296,7 +296,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
/**
* Product Url Instance
*
* @var Mage_Catalog_Model_Product_Url
* @var Mage_Catalog_Model_Product_Url|null
*/
protected $_urlModel = null;

Expand Down Expand Up @@ -329,7 +329,7 @@ class Mage_Catalog_Model_Product extends Mage_Catalog_Model_Abstract
protected $_calculatePrice = true;

/**
* @var Mage_CatalogInventory_Model_Stock_Item
* @var Mage_CatalogInventory_Model_Stock_Item|null
*/
protected $_stockItem;

Expand Down Expand Up @@ -698,7 +698,7 @@ public function hasStockItem()
}

/**
* @param Varien_Object|Mage_CatalogInventory_Model_Stock_Item $stockItem
* @param Mage_CatalogInventory_Model_Stock_Item $stockItem
* @return $this
*/
public function setStockItem($stockItem)
Expand Down Expand Up @@ -2255,14 +2255,23 @@ protected function _clearData()
$this->setData([]);
$this->setOrigData();
$this->_customOptions = [];
$this->_optionInstance = null;
$this->_options = [];
$this->_canAffectOptions = false;
$this->_errors = [];
$this->_defaultValues = [];
$this->_storeValuesFlags = [];
$this->_lockedAttributes = [];
$this->_customOptions = [];
$this->_optionInstance = null;
$this->_options = [];
$this->_canAffectOptions = false;
$this->_errors = [];
$this->_defaultValues = [];
$this->_storeValuesFlags = [];
$this->_lockedAttributes = [];
$this->_typeInstance = null;
$this->_typeInstanceSingleton = null;
$this->_linkInstance = null;
$this->_reservedAttributes = null;
$this->_isDuplicable = true;
$this->_calculatePrice = true;
$this->_stockItem = null;
$this->_isDeleteable = true;
$this->_isReadonly = false;
return $this;
}
Expand Down
10 changes: 0 additions & 10 deletions phpstan.dist.baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -1585,16 +1585,6 @@ parameters:
count: 1
path: app/code/core/Mage/Catalog/Model/Product.php

-
message: "#^Property Mage_Catalog_Model_Product\\:\\:\\$_stockItem \\(Mage_CatalogInventory_Model_Stock_Item\\) does not accept Varien_Object\\.$#"
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

-
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
Expand Down

0 comments on commit 4840185

Please sign in to comment.