Skip to content

Commit e8194fd

Browse files
okolesnykokolesnyk
committed
Merge branch '2.2-develop' of github.com:magento/magento2ce into Mavericks-PR
2 parents 4cf1a1f + a716c96 commit e8194fd

File tree

169 files changed

+1543
-533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+1543
-533
lines changed

‎app/code/Magento/AdminNotification/Model/Inbox.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
/**
1313
* AdminNotification Inbox model
1414
*
15-
* @method \Magento\AdminNotification\Model\ResourceModel\Inbox _getResource()
16-
* @method \Magento\AdminNotification\Model\ResourceModel\Inbox getResource()
1715
* @method int getSeverity()
1816
* @method \Magento\AdminNotification\Model\Inbox setSeverity(int $value)
1917
* @method string getDateAdded()

‎app/code/Magento/Authorization/Model/Role.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* Admin Role Model
1010
*
1111
* @api
12-
* @method \Magento\Authorization\Model\ResourceModel\Role _getResource()
13-
* @method \Magento\Authorization\Model\ResourceModel\Role getResource()
1412
* @method int getParentId()
1513
* @method \Magento\Authorization\Model\Role setParentId(int $value)
1614
* @method int getTreeLevel()

‎app/code/Magento/Authorization/Model/Rules.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
/**
1010
* Admin Rules Model
1111
*
12-
* @method \Magento\Authorization\Model\ResourceModel\Rules _getResource()
13-
* @method \Magento\Authorization\Model\ResourceModel\Rules getResource()
1412
* @method int getRoleId()
1513
* @method \Magento\Authorization\Model\Rules setRoleId(int $value)
1614
* @method string getResourceId()

‎app/code/Magento/Authorizenet/Model/Debug.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
namespace Magento\Authorizenet\Model;
77

88
/**
9-
* @method \Magento\Authorizenet\Model\ResourceModel\Debug _getResource()
10-
* @method \Magento\Authorizenet\Model\ResourceModel\Debug getResource()
119
* @method string getRequestBody()
1210
* @method \Magento\Authorizenet\Model\Debug setRequestBody(string $value)
1311
* @method string getResponseBody()

‎app/code/Magento/Catalog/Model/AbstractModel.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ public function unsetData($key = null)
222222
* Get collection instance
223223
*
224224
* @return \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
225+
* @deprecated because collections should be used directly via factory
225226
*/
226227
public function getResourceCollection()
227228
{

‎app/code/Magento/Catalog/Model/Entity/Attribute.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
/**
1313
* Product attribute extension with event dispatching
1414
*
15-
* @method \Magento\Catalog\Model\ResourceModel\Attribute _getResource()
16-
* @method \Magento\Catalog\Model\ResourceModel\Attribute getResource()
1715
* @method string getFrontendInputRenderer()
1816
* @method \Magento\Catalog\Model\Entity\Attribute setFrontendInputRenderer(string $value)
1917
* @method int setIsGlobal(int $value)

‎app/code/Magento/Catalog/Model/Product.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
*
2121
* @api
2222
* @method Product setHasError(bool $value)
23-
* @method \Magento\Catalog\Model\ResourceModel\Product getResource()
2423
* @method null|bool getHasError()
2524
* @method array getAssociatedProductIds()
2625
* @method Product setNewVariationsAttributeSetId(int $value)
2726
* @method int getNewVariationsAttributeSetId()
2827
* @method int getPriceType()
29-
* @method \Magento\Catalog\Model\ResourceModel\Product\Collection getCollection()
3028
* @method string getUrlKey()
3129
* @method Product setUrlKey(string $urlKey)
3230
* @method Product setRequestPath(string $requestPath)
@@ -503,6 +501,7 @@ public function getStoreId()
503501
* Get collection instance
504502
*
505503
* @return object
504+
* @deprecated because collections should be used directly via factory
506505
*/
507506
public function getResourceCollection()
508507
{

‎app/code/Magento/Catalog/Model/Product/Action.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,6 @@ protected function _construct()
7878
$this->_init(\Magento\Catalog\Model\ResourceModel\Product\Action::class);
7979
}
8080

81-
/**
82-
* Retrieve resource instance wrapper
83-
*
84-
* @return \Magento\Catalog\Model\ResourceModel\Product\Action
85-
*/
86-
protected function _getResource()
87-
{
88-
return parent::_getResource();
89-
}
90-
9181
/**
9282
* Update attribute values for entity list per store
9383
*

‎app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ public function afterSave($object)
128128
$attribute = $this->getAttribute();
129129
$attributeCode = $attribute->getAttributeCode();
130130
$value = $object->getData($attributeCode);
131-
if ((float)$value > 0) {
131+
// $value may be passed as null to unset the attribute
132+
if ($value === null || (float)$value > 0) {
132133
if ($attribute->isScopeWebsite() && $object->getStoreId() != \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
133134
if ($this->isUseDefault($object)) {
134135
$value = null;

‎app/code/Magento/Catalog/Model/Product/Compare/Item.php‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
* Catalog Compare Item Model
1212
*
1313
* @api
14-
*
15-
* @method \Magento\Catalog\Model\ResourceModel\Product\Compare\Item getResource()
1614
* @method \Magento\Catalog\Model\Product\Compare\Item setVisitorId(int $value)
1715
* @method \Magento\Catalog\Model\Product\Compare\Item setCustomerId(int $value)
1816
* @method int getProductId()
@@ -110,16 +108,6 @@ protected function _construct()
110108
$this->_init(\Magento\Catalog\Model\ResourceModel\Product\Compare\Item::class);
111109
}
112110

113-
/**
114-
* Retrieve Resource instance
115-
*
116-
* @return \Magento\Catalog\Model\ResourceModel\Product\Compare\Item
117-
*/
118-
protected function _getResource()
119-
{
120-
return parent::_getResource();
121-
}
122-
123111
/**
124112
* Set current store before save
125113
*

0 commit comments

Comments
 (0)