Skip to content

Commit 9e07db1

Browse files
committed
MC-16106: [2.3] Failed UI upgrade
1 parent e9fb986 commit 9e07db1

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Role extends \Magento\Framework\Model\AbstractModel
4040
* @param \Magento\Authorization\Model\ResourceModel\Role\Collection $resourceCollection
4141
* @param array $data
4242
*/
43-
public function __construct(
43+
public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
4444
\Magento\Framework\Model\Context $context,
4545
\Magento\Framework\Registry $registry,
4646
\Magento\Authorization\Model\ResourceModel\Role $resource,

app/code/Magento/Backend/Model/Auth/Session.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* @method \Magento\Backend\Model\Auth\Session setUpdatedAt(int $value)
2121
*
2222
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
23+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2324
* @todo implement solution that keeps is_first_visit flag in session during redirects
2425
* @api
2526
* @since 100.0.2

app/code/Magento/User/Model/User.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@ public function roleUserExists()
448448
* @throws NotificationExceptionInterface
449449
* @deprecated
450450
* @see NotificatorInterface::sendForgotPassword()
451-
*
452451
*/
453452
public function sendPasswordResetConfirmationEmail()
454453
{

lib/internal/Magento/Framework/App/Response/Http.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
/**
2020
* HTTP response
21+
*
22+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2123
*/
2224
class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
2325
{

lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ public function setCustomAttribute($attributeCode, $attributeValue)
183183

184184
/**
185185
* {@inheritdoc} Added custom attributes support.
186+
*
187+
* @param string|array $key
188+
* @param mixed $value
189+
* @return $this
186190
*/
187191
public function setData($key, $value = null)
188192
{
@@ -199,6 +203,9 @@ public function setData($key, $value = null)
199203

200204
/**
201205
* {@inheritdoc} Unset customAttributesChanged flag
206+
*
207+
* @param null|string|array $key
208+
* @return $thi
202209
*/
203210
public function unsetData($key = null)
204211
{

lib/internal/Magento/Framework/Translate/Inline/Proxy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function getParser()
122122
/**
123123
* Replace translation templates with HTML fragments
124124
*
125-
* @param array|string &$body
125+
* @param array|string $body
126126
* @param bool $isJson
127127
* @return $this
128128
*/

0 commit comments

Comments
 (0)