Skip to content

Commit b686d7d

Browse files
anupdugaranupdugar
committed
Merge remote-tracking branch 'remotes/origin/develop' into MAGETWO-26227-Upload-Image-Attribute
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
2 parents 38784be + 5b69b87 commit b686d7d

File tree

176 files changed

+3018
-447
lines changed

Some content is hidden

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

176 files changed

+3018
-447
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ public function getFeedData()
239239
}
240240

241241
/**
242+
* Retrieve feed as XML element
243+
*
242244
* @return \SimpleXMLElement
243245
*/
244246
public function getFeedXml()

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Magento\Framework\Notification\MessageInterface;
99
use Magento\Framework\Notification\NotifierInterface;
10+
use Magento\AdminNotification\Model\InboxInterface;
1011

1112
/**
1213
* AdminNotification Inbox model
@@ -30,7 +31,7 @@
3031
*
3132
* @author Magento Core Team <core@magentocommerce.com>
3233
*/
33-
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface
34+
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3435
{
3536
/**
3637
* @return void
@@ -41,10 +42,7 @@ protected function _construct()
4142
}
4243

4344
/**
44-
* Retrieve Severity collection array
45-
*
46-
* @param int|null $severity
47-
* @return array|string|null
45+
* {@inheritdoc}
4846
*/
4947
public function getSeverities($severity = null)
5048
{
@@ -66,9 +64,7 @@ public function getSeverities($severity = null)
6664
}
6765

6866
/**
69-
* Retrieve Latest Notice
70-
*
71-
* @return $this
67+
* {@inheritdoc}
7268
*/
7369
public function loadLatestNotice()
7470
{
@@ -78,9 +74,7 @@ public function loadLatestNotice()
7874
}
7975

8076
/**
81-
* Retrieve notice statuses
82-
*
83-
* @return array
77+
* {@inheritdoc}
8478
*/
8579
public function getNoticeStatus()
8680
{

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\AdminNotification\Model;
7+
8+
/**
9+
* AdminNotification Inbox interface
10+
*
11+
* @author Magento Core Team <core@magentocommerce.com>
12+
*/
13+
interface InboxInterface
14+
{
15+
/**
16+
* Retrieve Severity collection array
17+
*
18+
* @param int|null $severity
19+
* @return array|string|null
20+
* @api
21+
*/
22+
public function getSeverities($severity = null);
23+
24+
/**
25+
* Retrieve Latest Notice
26+
*
27+
* @return $this
28+
* @api
29+
*/
30+
public function loadLatestNotice();
31+
32+
/**
33+
* Retrieve notice statuses
34+
*
35+
* @return array
36+
* @api
37+
*/
38+
public function getNoticeStatus();
39+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\AdminNotification\Model\System\Message;
108

119
use Magento\Store\Model\Store;
@@ -121,7 +119,9 @@ public function isDisplayed()
121119
public function getText()
122120
{
123121
return __(
124-
'{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href="%1">configuration</a>.',
122+
'{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure '
123+
. 'URL / Base Secure URL. It is highly recommended to change this value in your Magento '
124+
. '<a href="%1">configuration</a>.',
125125
$this->_getConfigUrl()
126126
);
127127
}

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
108

119
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
@@ -36,7 +34,8 @@ protected function _shouldBeDisplayed()
3634
public function getText()
3735
{
3836
return __(
39-
'One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.'
37+
'One or more media files failed to be synchronized during the media storages synchronization process. '
38+
. 'Refer to the log file for details.'
4039
);
4140
}
4241
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\AdminNotification\Model\System\Message;
108

119
use Magento\Store\Model\Store;
@@ -26,6 +24,7 @@ class Security implements \Magento\Framework\Notification\MessageInterface
2624

2725
/**
2826
* Time out for HTTP verification request
27+
*
2928
* @var int
3029
*/
3130
private $_verificationTimeOut = 2;
@@ -136,7 +135,8 @@ public function isDisplayed()
136135
public function getText()
137136
{
138137
return __(
139-
'Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.'
138+
'Your web server is configured incorrectly. As a result, configuration files '
139+
. ' with sensitive information are accessible from the outside. Please contact your hosting provider.'
140140
);
141141
}
142142

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ interface UserContextInterface
2424
* Identify current user ID.
2525
*
2626
* @return int|null
27+
* @api
2728
*/
2829
public function getUserId();
2930

3031
/**
3132
* Retrieve current user type.
3233
*
3334
* @return int|null
35+
* @api
3436
*/
3537
public function getUserType();
3638
}

‎app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,28 @@
77

88
namespace Magento\Customer\Controller\Adminhtml\Customer;
99

10+
use Magento\Integration\Api\CustomerTokenServiceInterface;
11+
1012
/**
1113
* Class to invalidate tokens for customers
1214
*/
1315
class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index
1416
{
17+
/**
18+
* @var CustomerTokenServiceInterface
19+
*/
20+
protected $tokenService;
21+
22+
/**
23+
* Inject dependencies.
24+
*
25+
* @param CustomerTokenServiceInterface $tokenService
26+
*/
27+
public function __construct(CustomerTokenServiceInterface $tokenService)
28+
{
29+
$this->tokenService = $tokenService;
30+
}
31+
1532
/**
1633
* Reset customer's tokens handler
1734
*
@@ -22,9 +39,7 @@ public function execute()
2239
$resultRedirect = $this->resultRedirectFactory->create();
2340
if ($customerId = $this->getRequest()->getParam('customer_id')) {
2441
try {
25-
/** @var \Magento\Integration\Service\V1\CustomerTokenService $tokenService */
26-
$tokenService = $this->_objectManager->get('Magento\Integration\Service\V1\CustomerTokenService');
27-
$tokenService->revokeCustomerAccessToken($customerId);
42+
$this->tokenService->revokeCustomerAccessToken($customerId);
2843
$this->messageManager->addSuccess(__('You have revoked the customer\'s tokens.'));
2944
$resultRedirect->setPath('customer/index/edit', ['id' => $customerId, '_current' => true]);
3045
} catch (\Exception $e) {

‎app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Magento\Customer\Model\Plugin;
88

99
use Magento\Authorization\Model\UserContextInterface;
10-
use Magento\Integration\Service\V1\AuthorizationServiceInterface as AuthorizationService;
10+
use Magento\Integration\Api\AuthorizationServiceInterface as AuthorizationService;
1111

1212
/**
1313
* Plugin around \Magento\Framework\Authorization::isAllowed

‎app/code/Magento/Directory/Model/Country.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ protected function _construct()
7373
}
7474

7575
/**
76+
* Load country by code
77+
*
7678
* @param string $code
7779
* @return $this
7880
*/
@@ -83,6 +85,8 @@ public function loadByCode($code)
8385
}
8486

8587
/**
88+
* Get regions
89+
*
8690
* @return \Magento\Directory\Model\Resource\Region\Collection
8791
*/
8892
public function getRegions()
@@ -152,7 +156,7 @@ public function formatAddress(\Magento\Framework\Object $address, $html = false)
152156
}
153157

154158
/**
155-
* Retrieve formats for
159+
* Retrieve country formats
156160
*
157161
* @return \Magento\Directory\Model\Resource\Country\Format\Collection
158162
*/
@@ -172,7 +176,7 @@ public function getFormats()
172176
}
173177

174178
/**
175-
* Retrieve format
179+
* Retrieve country format
176180
*
177181
* @param string $type
178182
* @return \Magento\Directory\Model\Country\Format|null
@@ -190,6 +194,8 @@ public function getFormat($type)
190194
}
191195

192196
/**
197+
* Get country name
198+
*
193199
* @return string
194200
*/
195201
public function getName()

0 commit comments

Comments
 (0)