Skip to content

Commit 09baa0e

Browse files
author
Stanislav Idolov
committed
magento-engcom/magento2ce#2237: Fixed static tests failures
1 parent 0e883ab commit 09baa0e

File tree

8 files changed

+51
-24
lines changed

8 files changed

+51
-24
lines changed

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

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ public function __construct(
167167
}
168168

169169
/**
170+
* Init model
171+
*
170172
* @return void
171173
*/
172174
protected function _construct()
@@ -362,6 +364,7 @@ public function getStoreId()
362364

363365
/**
364366
* Retrieve apply to products array
367+
*
365368
* Return empty array if applied to all products
366369
*
367370
* @return string[]
@@ -507,128 +510,128 @@ public function getIndexType()
507510
}
508511

509512
/**
513+
* @inheritdoc
510514
* @codeCoverageIgnoreStart
511-
* {@inheritdoc}
512515
*/
513516
public function getIsWysiwygEnabled()
514517
{
515518
return $this->_getData(self::IS_WYSIWYG_ENABLED);
516519
}
517520

518521
/**
519-
* {@inheritdoc}
522+
* @inheritdoc
520523
*/
521524
public function getIsHtmlAllowedOnFront()
522525
{
523526
return $this->_getData(self::IS_HTML_ALLOWED_ON_FRONT);
524527
}
525528

526529
/**
527-
* {@inheritdoc}
530+
* @inheritdoc
528531
*/
529532
public function getUsedForSortBy()
530533
{
531534
return $this->_getData(self::USED_FOR_SORT_BY);
532535
}
533536

534537
/**
535-
* {@inheritdoc}
538+
* @inheritdoc
536539
*/
537540
public function getIsFilterable()
538541
{
539542
return $this->_getData(self::IS_FILTERABLE);
540543
}
541544

542545
/**
543-
* {@inheritdoc}
546+
* @inheritdoc
544547
*/
545548
public function getIsFilterableInSearch()
546549
{
547550
return $this->_getData(self::IS_FILTERABLE_IN_SEARCH);
548551
}
549552

550553
/**
551-
* {@inheritdoc}
554+
* @inheritdoc
552555
*/
553556
public function getIsUsedInGrid()
554557
{
555558
return (bool)$this->_getData(self::IS_USED_IN_GRID);
556559
}
557560

558561
/**
559-
* {@inheritdoc}
562+
* @inheritdoc
560563
*/
561564
public function getIsVisibleInGrid()
562565
{
563566
return (bool)$this->_getData(self::IS_VISIBLE_IN_GRID);
564567
}
565568

566569
/**
567-
* {@inheritdoc}
570+
* @inheritdoc
568571
*/
569572
public function getIsFilterableInGrid()
570573
{
571574
return (bool)$this->_getData(self::IS_FILTERABLE_IN_GRID);
572575
}
573576

574577
/**
575-
* {@inheritdoc}
578+
* @inheritdoc
576579
*/
577580
public function getPosition()
578581
{
579582
return $this->_getData(self::POSITION);
580583
}
581584

582585
/**
583-
* {@inheritdoc}
586+
* @inheritdoc
584587
*/
585588
public function getIsSearchable()
586589
{
587590
return $this->_getData(self::IS_SEARCHABLE);
588591
}
589592

590593
/**
591-
* {@inheritdoc}
594+
* @inheritdoc
592595
*/
593596
public function getIsVisibleInAdvancedSearch()
594597
{
595598
return $this->_getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
596599
}
597600

598601
/**
599-
* {@inheritdoc}
602+
* @inheritdoc
600603
*/
601604
public function getIsComparable()
602605
{
603606
return $this->_getData(self::IS_COMPARABLE);
604607
}
605608

606609
/**
607-
* {@inheritdoc}
610+
* @inheritdoc
608611
*/
609612
public function getIsUsedForPromoRules()
610613
{
611614
return $this->_getData(self::IS_USED_FOR_PROMO_RULES);
612615
}
613616

614617
/**
615-
* {@inheritdoc}
618+
* @inheritdoc
616619
*/
617620
public function getIsVisibleOnFront()
618621
{
619622
return $this->_getData(self::IS_VISIBLE_ON_FRONT);
620623
}
621624

622625
/**
623-
* {@inheritdoc}
626+
* @inheritdoc
624627
*/
625628
public function getUsedInProductListing()
626629
{
627630
return $this->_getData(self::USED_IN_PRODUCT_LISTING);
628631
}
629632

630633
/**
631-
* {@inheritdoc}
634+
* @inheritdoc
632635
*/
633636
public function getIsVisible()
634637
{
@@ -638,7 +641,7 @@ public function getIsVisible()
638641
//@codeCoverageIgnoreEnd
639642

640643
/**
641-
* {@inheritdoc}
644+
* @inheritdoc
642645
*/
643646
public function getScope()
644647
{
@@ -720,7 +723,7 @@ public function setPosition($position)
720723
/**
721724
* Set apply to value for the element
722725
*
723-
* @param string []|string
726+
* @param string[]|string $applyTo
724727
* @return $this
725728
*/
726729
public function setApplyTo($applyTo)
@@ -829,7 +832,7 @@ public function setScope($scope)
829832
}
830833

831834
/**
832-
* {@inheritdoc}
835+
* @inheritdoc
833836
*/
834837
public function afterDelete()
835838
{

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ public function getIdxTable($table = null)
330330
}
331331

332332
/**
333+
* Save data from select
334+
*
333335
* @param \Magento\Framework\DB\Select $select
334336
* @param array $options
335337
* @return void

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ protected function _construct()
8585

8686
/**
8787
* Proceed operations after object is saved
88+
*
8889
* Save options store data
8990
*
9091
* @param AbstractModel $object

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
@@ -9,8 +8,12 @@
98
use Magento\Backend\App\Action\Context;
109
use Magento\Catalog\Model\Category;
1110
use Magento\Framework\Registry;
11+
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
1212

13-
class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget
13+
/**
14+
* Categories json widget for catalog rule
15+
*/
16+
class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget implements HttpPostActionInterface
1417
{
1518
/**
1619
* Core registry

app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function getCurrencySymbolsData()
187187
/**
188188
* Save currency symbol to config
189189
*
190-
* @param $symbols array
190+
* @param array $symbols
191191
* @return $this
192192
*/
193193
public function setCurrencySymbolsData($symbols = [])

app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
use Magento\Framework\Module\Manager;
1212
use Magento\Framework\Event\ObserverInterface;
1313

14+
/**
15+
* Observer for Product Attribute Form
16+
*/
1417
class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
1518
{
1619
/**
@@ -34,6 +37,8 @@ public function __construct(Manager $moduleManager, Source\Yesno $optionList)
3437
}
3538

3639
/**
40+
* Execute
41+
*
3742
* @param \Magento\Framework\Event\Observer $observer
3843
* @return void
3944
*/

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php

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

77
namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate;
88

9+
/**
10+
* Query builder for table rate
11+
*/
912
class RateQuery
1013
{
1114
/**
@@ -24,6 +27,8 @@ public function __construct(
2427
}
2528

2629
/**
30+
* Prepare select
31+
*
2732
* @param \Magento\Framework\DB\Select $select
2833
* @return \Magento\Framework\DB\Select
2934
*/
@@ -77,6 +82,8 @@ public function prepareSelect(\Magento\Framework\DB\Select $select)
7782
}
7883

7984
/**
85+
* Returns query bindings
86+
*
8087
* @return array
8188
*/
8289
public function getBindings()
@@ -108,6 +115,8 @@ public function getBindings()
108115
}
109116

110117
/**
118+
* Returns rate request
119+
*
111120
* @return \Magento\Quote\Model\Quote\Address\RateRequest
112121
*/
113122
public function getRequest()
@@ -116,8 +125,8 @@ public function getRequest()
116125
}
117126

118127
/**
119-
* Returns the entire postcode if it contains no dash
120-
* or the part of it prior to the dash in the other case
128+
* Returns the entire postcode if it contains no dash or the part of it prior to the dash in the other case
129+
*
121130
* @return string
122131
*/
123132
private function getDestPostcodePrefix()

app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@
5959
}
6060

6161
.abs-field-no-label {
62+
/**
63+
*@codingStandardsIgnoreStart
64+
*/
6265
#mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
66+
//@codingStandardsIgnoreEnd
6367
margin-left: @_length;
6468
}
6569

0 commit comments

Comments
 (0)