Skip to content

Commit 4cf1a1f

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

File tree

2,856 files changed

+3026
-14432
lines changed

Some content is hidden

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

2,856 files changed

+3026
-14432
lines changed

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Magento\Store\Model\Store;
1010

1111
/**
12-
* @deprecated 2.1.0
12+
* @deprecated 100.1.0
1313
*/
1414
class Baseurl implements \Magento\Framework\Notification\MessageInterface
1515
{

‎app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/**
1212
* @api
13-
* @since 2.2.0
13+
* @since 100.2.0
1414
*/
1515
class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
1616
{
@@ -22,7 +22,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
2222
* @param SynchronizedFactory $messageCollectionFactory
2323
* @param array $meta
2424
* @param array $data
25-
* @since 2.2.0
25+
* @since 100.2.0
2626
*/
2727
public function __construct(
2828
$name,

‎app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ protected function correctExportData($exportData)
329329
*
330330
* @param string $tierPricePercentage
331331
* @return string
332-
* @since 2.2.0
333332
*/
334333
private function tierPriceTypeValue($tierPricePercentage)
335334
{

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
163163
* Product entity link field
164164
*
165165
* @var string
166-
* @since 2.1.0
167166
*/
168167
private $productEntityLinkField;
169168

@@ -620,7 +619,6 @@ protected function processCountNewPrices(array $tierPrices)
620619
* Get product entity link field
621620
*
622621
* @return string
623-
* @since 2.1.0
624622
*/
625623
private function getProductEntityLinkField()
626624
{

‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111

1212
/**
1313
* Class TierPriceType validates tier price type.
14-
* @since 2.2.0
1514
*/
1615
class TierPriceType extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator
1716
{
1817
/**
1918
* {@inheritdoc}
20-
* @since 2.2.0
2119
*/
2220
public function init($context)
2321
{
@@ -29,7 +27,6 @@ public function init($context)
2927
*
3028
* @param array $value
3129
* @return bool
32-
* @since 2.2.0
3330
*/
3431
public function isValid($value)
3532
{

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,16 @@ class Role implements \Magento\Framework\Acl\LoaderInterface
3838

3939
/**
4040
* @var \Magento\Framework\Acl\Data\CacheInterface
41-
* @since 2.2.0
4241
*/
4342
private $aclDataCache;
4443

4544
/**
4645
* @var Json
47-
* @since 2.2.0
4846
*/
4947
private $serializer;
5048

5149
/**
5250
* @var string
53-
* @since 2.2.0
5451
*/
5552
private $cacheKey;
5653

@@ -110,7 +107,6 @@ public function populateAcl(\Magento\Framework\Acl $acl)
110107
* Get application ACL roles array
111108
*
112109
* @return array
113-
* @since 2.2.0
114110
*/
115111
private function getRolesArray()
116112
{

‎app/code/Magento/Authorization/Model/Acl/Loader/Rule.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,21 @@ class Rule implements \Magento\Framework\Acl\LoaderInterface
2626

2727
/**
2828
* @var \Magento\Framework\Acl\RootResource
29-
* @since 2.2.0
3029
*/
3130
private $_rootResource;
3231

3332
/**
3433
* @var \Magento\Framework\Acl\Data\CacheInterface
35-
* @since 2.2.0
3634
*/
3735
private $aclDataCache;
3836

3937
/**
4038
* @var Json
41-
* @since 2.2.0
4239
*/
4340
private $serializer;
4441

4542
/**
4643
* @var string
47-
* @since 2.2.0
4844
*/
4945
private $cacheKey;
5046

@@ -104,7 +100,6 @@ public function populateAcl(\Magento\Framework\Acl $acl)
104100
* Get application ACL rules array.
105101
*
106102
* @return array
107-
* @since 2.2.0
108103
*/
109104
private function getRulesArray()
110105
{

‎app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Admin permissions collection
1010
*
11-
* @deprecated 2.2.0
11+
* @deprecated 100.2.0
1212
* @see \Magento\Authorization\Model\ResourceModel\Rules\Collection
1313
*/
1414
class Collection extends \Magento\Authorization\Model\ResourceModel\Rules\Collection

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
3232

3333
/**
3434
* @var \Magento\Framework\Acl\Data\CacheInterface
35-
* @since 2.2.0
3635
*/
3736
private $aclDataCache;
3837

‎app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Paymen
1717
* Action for Authorize.net SIM Relay Request.
1818
*
1919
* @return \Magento\Framework\Controller\ResultInterface
20-
* @since 2.1.0
2120
*/
2221
public function execute()
2322
{

0 commit comments

Comments
 (0)