Skip to content

Commit a61b5fd

Browse files
author
Robert He
committed
Merge branch 'FearlessKiwis-MAGETWO-39438-deprecated_tag' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop
Conflicts: app/code/Magento/Bundle/Model/Product/Price.php app/code/Magento/Catalog/Model/Product/Type/Price.php lib/internal/Magento/Framework/Encryption/Encryptor.php
2 parents 2ccbe92 + b03edea commit a61b5fd

File tree

66 files changed

+8
-113
lines changed

Some content is hidden

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

66 files changed

+8
-113
lines changed

‎app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ protected function _processLocaleSettings()
300300
/**
301301
* Set redirect into response
302302
*
303-
* @deprecated
304303
* @TODO MAGETWO-28356: Refactor controller actions to new ResultInterface
305304
* @param string $path
306305
* @param array $arguments
@@ -316,7 +315,6 @@ protected function _redirect($path, $arguments = [])
316315
/**
317316
* Forward to action
318317
*
319-
* @deprecated
320318
* @TODO MAGETWO-28356: Refactor controller actions to new ResultInterface
321319
* @param string $action
322320
* @param string|null $controller

‎app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1212
* @method boolean getHideFormElement()
1313
* @author Magento Core Team <core@magentocommerce.com>
14-
* @deprecated support Magento 1.x grid massaction implementation
1514
* @TODO MAGETWO-31510: Remove deprecated class
1615
*/
1716
class Extended extends \Magento\Backend\Block\Widget

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
// @codingStandardsIgnoreFile
88

9-
/**
10-
* @deprecated support Magento 1.x grid massaction implementation
11-
*/
129
?>
1310
<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
1411

‎app/code/Magento/Bundle/Model/Product/Price.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ public function getIsPricesCalculatedByIndex()
9797
*
9898
* @param \Magento\Catalog\Model\Product $product
9999
* @return float
100-
*
101-
* @deprecated (MAGETWO-31476)
102100
*/
103101
public function getPrice($product)
104102
{
@@ -375,7 +373,6 @@ public function getOptions($product)
375373
* @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
376374
* @return float
377375
*
378-
* @deprecated after 1.6.2.0 (MAGETWO-31475)
379376
* @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
380377
*/
381378
public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQty = null, $multiplyQty = true)

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ public function getStoreConfigurationUrl()
142142

143143
/**
144144
* @return string
145-
* @deprecated (MAGETWO-31464)
146145
*/
147146
public function getDeleteButtonHtml()
148147
{
@@ -151,7 +150,6 @@ public function getDeleteButtonHtml()
151150

152151
/**
153152
* @return string
154-
* @deprecated (MAGETWO-31464)
155153
*/
156154
public function getSaveButtonHtml()
157155
{
@@ -163,7 +161,6 @@ public function getSaveButtonHtml()
163161

164162
/**
165163
* @return string
166-
* @deprecated (MAGETWO-31464)
167164
*/
168165
public function getResetButtonHtml()
169166
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,6 @@ public function setTierPrices(array $tierPrices = null)
10891089
*
10901090
* @param float $qty
10911091
* @return float|array
1092-
* @deprecated (MAGETWO-31465)
10931092
*/
10941093
public function getTierPrice($qty = null)
10951094
{

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
254254
* @param float $qty
255255
* @param Product $product
256256
* @return float|array
257-
* @deprecated (MAGETWO-31465)
258257
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
259258
* @SuppressWarnings(PHPMD.NPathComplexity)
260259
*/
@@ -438,7 +437,6 @@ protected function _applySpecialPrice($product, $finalPrice)
438437
*
439438
* @param Product $product
440439
* @return int
441-
* @deprecated
442440
*/
443441
public function getTierPriceCount($product)
444442
{
@@ -452,7 +450,6 @@ public function getTierPriceCount($product)
452450
* @param float $qty
453451
* @param Product $product
454452
* @return array|float
455-
* @deprecated
456453
*/
457454
public function getFormatedTierPrice($qty, $product)
458455
{
@@ -488,7 +485,6 @@ public function getFormatedPrice($product)
488485
* @param int $qty
489486
* @param float $finalPrice
490487
* @return float
491-
* @deprecated (MAGETWO-31469)
492488
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
493489
*/
494490
protected function _applyOptionsPrice($product, $qty, $finalPrice)

‎app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
// @codingStandardsIgnoreFile
88

9-
/**
10-
* @deprecated support Magento 1.x grid massaction implementation (MAGETWO-11122)
11-
*/
129
?>
1310
<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
1411
<?php if ($block->getHideFormElement() !== true):?>

‎app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/**
1212
* Search collection
1313
*
14-
* @deprecated
1514
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1615
*/
1716
class Collection extends \Magento\Catalog\Model\Resource\Product\Collection implements \Magento\Search\Model\SearchCollectionInterface

‎app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ public function isCustomerLoggedIn()
188188

189189
/**
190190
* @return Collection
191-
* @deprecated
192191
* @removeCandidate
193192
*/
194193
public function getCountryCollection()
@@ -201,7 +200,6 @@ public function getCountryCollection()
201200

202201
/**
203202
* @return RegionCollection
204-
* @deprecated
205203
* @removeCandidate
206204
*/
207205
public function getRegionCollection()
@@ -216,7 +214,6 @@ public function getRegionCollection()
216214

217215
/**
218216
* @return int
219-
* @deprecated
220217
* @removeCandidate
221218
*/
222219
public function customerHasAddresses()
@@ -231,7 +228,6 @@ public function customerHasAddresses()
231228
/**
232229
* @param string $type
233230
* @return string
234-
* @deprecated
235231
* @removeCandidate
236232
*/
237233
public function getAddressesHtmlSelect($type)
@@ -285,7 +281,6 @@ public function getAddressesHtmlSelect($type)
285281
/**
286282
* @param string $type
287283
* @return string
288-
* @deprecated
289284
* @removeCandidate
290285
*/
291286
public function getCountryHtmlSelect($type)
@@ -315,7 +310,6 @@ public function getCountryHtmlSelect($type)
315310
/**
316311
* @param string $type
317312
* @return string
318-
* @deprecated
319313
* @removeCandidate
320314
*/
321315
public function getRegionHtmlSelect($type)
@@ -341,7 +335,6 @@ public function getRegionHtmlSelect($type)
341335

342336
/**
343337
* @return mixed
344-
* @deprecated
345338
* @removeCandidate
346339
*/
347340
public function getCountryOptions()
@@ -363,7 +356,6 @@ public function getCountryOptions()
363356
* Get checkout steps codes
364357
*
365358
* @return string[]
366-
* @deprecated
367359
* @removeCandidate
368360
*/
369361
protected function _getStepCodes()
@@ -375,7 +367,6 @@ protected function _getStepCodes()
375367
* Retrieve is allow and show block
376368
*
377369
* @return bool
378-
* @deprecated
379370
* @removeCandidate
380371
*/
381372
public function isShow()
@@ -388,7 +379,6 @@ public function isShow()
388379
*
389380
* @param \Magento\Quote\Model\Quote\Address\Rate $rate
390381
* @return string
391-
* @deprecated
392382
* @removeCandidate
393383
*/
394384
public function getShippingPriceHtml(\Magento\Quote\Model\Quote\Address\Rate $rate)

0 commit comments

Comments
 (0)