Skip to content

Commit 09ce15b

Browse files
fascinosumfascinosum
committed
MC-16106: [2.3] Failed UI upgrade
1 parent f661404 commit 09ce15b

File tree

27 files changed

+175
-137
lines changed

27 files changed

+175
-137
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function __construct(
5151
}
5252

5353
/**
54-
* {@inheritdoc}
54+
* @inheritDoc
5555
*/
5656
public function __sleep()
5757
{
@@ -60,7 +60,7 @@ public function __sleep()
6060
}
6161

6262
/**
63-
* {@inheritdoc}
63+
* @inheritDoc
6464
*/
6565
public function __wakeup()
6666
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public function isAllowed($resource, $privilege = null)
146146
return $acl->isAllowed($user->getAclRole(), null, $privilege);
147147
}
148148
} catch (\Exception $e) {
149+
return false;
149150
}
150151
}
151152
}

‎app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Test\Unit\Model\Authorization;
77

8+
/**
9+
* Class RoleLocatorTest
10+
*/
811
class RoleLocatorTest extends \PHPUnit\Framework\TestCase
912
{
1013
/**

‎app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php

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

88
use Magento\Framework\Locale\Resolver;
99

10+
/**
11+
* Class ManagerTest
12+
*/
1013
class ManagerTest extends \PHPUnit\Framework\TestCase
1114
{
1215
/**

‎app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ public function beforeSave()
193193
if ($this->_data[self::KEY_IS_GLOBAL] != $this->_origData[self::KEY_IS_GLOBAL]) {
194194
try {
195195
$this->attrLockValidator->validate($this);
196+
// phpcs:ignore Magento2.Exceptions.ThrowCatch
196197
} catch (\Magento\Framework\Exception\LocalizedException $exception) {
197198
throw new \Magento\Framework\Exception\LocalizedException(
198199
__('Do not change the scope. %1', $exception->getMessage())

‎app/code/Magento/Config/Model/Config/Backend/Encrypted.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22
/**
3-
* Encrypted config field backend model
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
86

97
namespace Magento\Config\Model\Config\Backend;
108

119
/**
10+
* Encrypted config field backend model.
11+
*
1212
* @api
1313
* @since 100.0.2
1414
*/

‎app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Catalog Configurable Product Attribute Model
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -10,8 +8,11 @@
108
use Magento\Catalog\Api\Data\ProductInterface;
119
use Magento\Framework\Api\AttributeValueFactory;
1210
use Magento\Framework\EntityManager\MetadataPool;
11+
use Magento\Framework\Exception\LocalizedException;
1312

1413
/**
14+
* Catalog Configurable Product Attribute Model
15+
*
1516
* @method Attribute setProductAttribute(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $value)
1617
* @method \Magento\Eav\Model\Entity\Attribute\AbstractAttribute getProductAttribute()
1718
*/
@@ -86,7 +87,7 @@ public function getOptions()
8687
}
8788

8889
/**
89-
* {@inheritdoc}
90+
* @inheritDoc
9091
*/
9192
public function getLabel()
9293
{
@@ -115,8 +116,8 @@ public function afterSave()
115116
* Load configurable attribute by product and product's attribute
116117
*
117118
* @param \Magento\Catalog\Model\Product $product
118-
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
119-
* @return void
119+
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
120+
* @throws LocalizedException
120121
*/
121122
public function loadByProductAndAttribute($product, $attribute)
122123
{
@@ -144,7 +145,8 @@ public function deleteByProduct($product)
144145
}
145146

146147
/**
147-
* {@inheritdoc}
148+
* @inheritDoc
149+
*
148150
* @codeCoverageIgnore
149151
*/
150152
public function getAttributeId()
@@ -153,7 +155,8 @@ public function getAttributeId()
153155
}
154156

155157
/**
156-
* {@inheritdoc}
158+
* @inheritDoc
159+
*
157160
* @codeCoverageIgnore
158161
*/
159162
public function getPosition()
@@ -162,7 +165,8 @@ public function getPosition()
162165
}
163166

164167
/**
165-
* {@inheritdoc}
168+
* @inheritDoc
169+
*
166170
* @codeCoverageIgnore
167171
*/
168172
public function getIsUseDefault()
@@ -171,7 +175,8 @@ public function getIsUseDefault()
171175
}
172176

173177
/**
174-
* {@inheritdoc}
178+
* @inheritDoc
179+
*
175180
* @codeCoverageIgnore
176181
*/
177182
public function getValues()
@@ -182,65 +187,55 @@ public function getValues()
182187
//@codeCoverageIgnoreStart
183188

184189
/**
185-
* @param string $attributeId
186-
* @return $this
190+
* @inheritDoc
187191
*/
188192
public function setAttributeId($attributeId)
189193
{
190194
return $this->setData(self::KEY_ATTRIBUTE_ID, $attributeId);
191195
}
192196

193197
/**
194-
* @param string $label
195-
* @return $this
198+
* @inheritDoc
196199
*/
197200
public function setLabel($label)
198201
{
199202
return $this->setData(self::KEY_LABEL, $label);
200203
}
201204

202205
/**
203-
* @param int $position
204-
* @return $this
206+
* @inheritDoc
205207
*/
206208
public function setPosition($position)
207209
{
208210
return $this->setData(self::KEY_POSITION, $position);
209211
}
210212

211213
/**
212-
* @param bool $isUseDefault
213-
* @return $this
214+
* @inheritDoc
214215
*/
215216
public function setIsUseDefault($isUseDefault)
216217
{
217218
return $this->setData(self::KEY_IS_USE_DEFAULT, $isUseDefault);
218219
}
219220

220221
/**
221-
* @param \Magento\ConfigurableProduct\Api\Data\OptionValueInterface[] $values
222-
* @return $this
222+
* @inheritDoc
223223
*/
224224
public function setValues(array $values = null)
225225
{
226226
return $this->setData(self::KEY_VALUES, $values);
227227
}
228228

229229
/**
230-
* {@inheritdoc}
231-
*
232-
* @return \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface|null
230+
* @inheritDoc
233231
*/
234232
public function getExtensionAttributes()
235233
{
236234
return $this->_getExtensionAttributes();
237235
}
238236

239237
/**
240-
* {@inheritdoc}
241-
*
242-
* @param \Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
243-
* @return $this
238+
* @inheritDoc
244239
*/
245240
public function setExtensionAttributes(
246241
\Magento\ConfigurableProduct\Api\Data\OptionExtensionInterface $extensionAttributes
@@ -249,15 +244,15 @@ public function setExtensionAttributes(
249244
}
250245

251246
/**
252-
* {@inheritdoc}
247+
* @inheritDoc
253248
*/
254249
public function getProductId()
255250
{
256251
return $this->getData(self::KEY_PRODUCT_ID);
257252
}
258253

259254
/**
260-
* {@inheritdoc}
255+
* @inheritDoc
261256
*/
262257
public function setProductId($value)
263258
{

‎app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Catalog Configurable Product Attribute Collection
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -18,6 +16,8 @@
1816
use Magento\Catalog\Api\Data\ProductInterface;
1917

2018
/**
19+
* Catalog Configurable Product Attribute Collection
20+
*
2121
* @api
2222
* @SuppressWarnings(PHPMD.LongVariable)
2323
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -302,7 +302,7 @@ protected function _loadLabels()
302302
}
303303

304304
/**
305-
* @return void
305+
* Load attribute options.
306306
*/
307307
protected function loadOptions()
308308
{
@@ -340,6 +340,7 @@ protected function loadOptions()
340340
* @param \Magento\Catalog\Model\Product[] $usedProducts
341341
* @param AbstractAttribute $productAttribute
342342
* @return array
343+
* @throws \Magento\Framework\Exception\LocalizedException
343344
*/
344345
protected function getIncludedOptions(array $usedProducts, AbstractAttribute $productAttribute)
345346
{

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ protected function _getDefaultSourceModel()
203203
* Delete entity
204204
*
205205
* @return \Magento\Eav\Model\ResourceModel\Entity\Attribute
206+
* @throws LocalizedException
206207
* @codeCoverageIgnore
207208
*/
208209
public function deleteEntity()
@@ -313,22 +314,14 @@ public function beforeSave()
313314
* Save additional data
314315
*
315316
* @return $this
317+
* @throws LocalizedException
316318
*/
317319
public function afterSave()
318320
{
319321
$this->_getResource()->saveInSetIncluding($this);
320322
return parent::afterSave();
321323
}
322324

323-
/**
324-
* @inheritdoc
325-
* @since 100.0.7
326-
*/
327-
public function afterDelete()
328-
{
329-
return parent::afterDelete();
330-
}
331-
332325
/**
333326
* Detect backend storage type using frontend input type
334327
*

‎app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php

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

77
namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Fieldset;
88

9+
/**
10+
* Class GroupTest
11+
*/
912
class GroupTest extends \PHPUnit\Framework\TestCase
1013
{
1114
/**

0 commit comments

Comments
 (0)