Skip to content

Commit be0c9fa

Browse files
JacobBrownAustinJacobBrownAustin
committed
ACPT-1327
fixing static test failures
1 parent b146ca5 commit be0c9fa

File tree

16 files changed

+32
-60
lines changed

16 files changed

+32
-60
lines changed

‎app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,6 @@ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
365365
* Get Catalog Rule Processor.
366366
*
367367
* @return \Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor
368-
*
369-
* @deprecated 100.2.0
370368
*/
371369
private function getCatalogRuleProcessor()
372370
{

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
4646
protected $_comparableAttributes;
4747

4848
/**
49-
* Catalog product compare
50-
*
5149
* @var \Magento\Catalog\Helper\Product\Compare
5250
*/
5351
protected $_catalogProductCompare = null;
5452

5553
/**
56-
* Catalog product compare item
57-
*
5854
* @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item
5955
*/
6056
protected $_catalogProductCompareItem;
@@ -299,7 +295,6 @@ public function getProductsByListId(int $listId): array
299295
return $this->getConnection()->fetchCol($select);
300296
}
301297

302-
303298
/**
304299
* Set list_id for customer compare item
305300
*

‎app/code/Magento/CatalogGraphQl/Model/Config/SortAttributeReader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ class SortAttributeReader implements ReaderInterface
3939

4040
/**
4141
* @param MapperInterface $mapper
42-
* @param AttributesCollection $attributesCollection
42+
* @param AttributesCollection $attributesCollection @deprecated @see $attributesCollectionFactory
4343
* @param AttributesCollectionFactory|null $attributesCollectionFactory
44+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4445
*/
4546
public function __construct(
4647
MapperInterface $mapper,

‎app/code/Magento/CatalogInventory/Model/Configuration.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,87 +21,87 @@ class Configuration implements StockConfigurationInterface, ResetAfterRequestInt
2121
/**
2222
* Default website id
2323
*/
24-
const DEFAULT_WEBSITE_ID = 1;
24+
public const DEFAULT_WEBSITE_ID = 1;
2525

2626
/**
2727
* Inventory options config path
2828
*/
29-
const XML_PATH_GLOBAL = 'cataloginventory/options/';
29+
public const XML_PATH_GLOBAL = 'cataloginventory/options/';
3030

3131
/**
3232
* Subtract config path
3333
*/
34-
const XML_PATH_CAN_SUBTRACT = 'cataloginventory/options/can_subtract';
34+
public const XML_PATH_CAN_SUBTRACT = 'cataloginventory/options/can_subtract';
3535

3636
/**
3737
* Back in stock config path
3838
*/
39-
const XML_PATH_CAN_BACK_IN_STOCK = 'cataloginventory/options/can_back_in_stock';
39+
public const XML_PATH_CAN_BACK_IN_STOCK = 'cataloginventory/options/can_back_in_stock';
4040

4141
/**
4242
* Item options config path
4343
*/
44-
const XML_PATH_ITEM = 'cataloginventory/item_options/';
44+
public const XML_PATH_ITEM = 'cataloginventory/item_options/';
4545

4646
/**
4747
* Max qty config path
4848
*/
49-
const XML_PATH_MIN_QTY = 'cataloginventory/item_options/min_qty';
49+
public const XML_PATH_MIN_QTY = 'cataloginventory/item_options/min_qty';
5050

5151
/**
5252
* Min sale qty config path
5353
*/
54-
const XML_PATH_MIN_SALE_QTY = 'cataloginventory/item_options/min_sale_qty';
54+
public const XML_PATH_MIN_SALE_QTY = 'cataloginventory/item_options/min_sale_qty';
5555

5656
/**
5757
* Max sale qty config path
5858
*/
59-
const XML_PATH_MAX_SALE_QTY = 'cataloginventory/item_options/max_sale_qty';
59+
public const XML_PATH_MAX_SALE_QTY = 'cataloginventory/item_options/max_sale_qty';
6060

6161
/**
6262
* Back orders config path
6363
*/
64-
const XML_PATH_BACKORDERS = 'cataloginventory/item_options/backorders';
64+
public const XML_PATH_BACKORDERS = 'cataloginventory/item_options/backorders';
6565

6666
/**
6767
* Notify stock config path
6868
*/
69-
const XML_PATH_NOTIFY_STOCK_QTY = 'cataloginventory/item_options/notify_stock_qty';
69+
public const XML_PATH_NOTIFY_STOCK_QTY = 'cataloginventory/item_options/notify_stock_qty';
7070

7171
/**
7272
* Manage stock config path
7373
*/
74-
const XML_PATH_MANAGE_STOCK = 'cataloginventory/item_options/manage_stock';
74+
public const XML_PATH_MANAGE_STOCK = 'cataloginventory/item_options/manage_stock';
7575

7676
/**
7777
* Enable qty increments config path
7878
*/
79-
const XML_PATH_ENABLE_QTY_INCREMENTS = 'cataloginventory/item_options/enable_qty_increments';
79+
public const XML_PATH_ENABLE_QTY_INCREMENTS = 'cataloginventory/item_options/enable_qty_increments';
8080

8181
/**
8282
* Qty increments config path
8383
*/
84-
const XML_PATH_QTY_INCREMENTS = 'cataloginventory/item_options/qty_increments';
84+
public const XML_PATH_QTY_INCREMENTS = 'cataloginventory/item_options/qty_increments';
8585

8686
/**
8787
* Show out of stock config path
8888
*/
89-
const XML_PATH_SHOW_OUT_OF_STOCK = 'cataloginventory/options/show_out_of_stock';
89+
public const XML_PATH_SHOW_OUT_OF_STOCK = 'cataloginventory/options/show_out_of_stock';
9090

9191
/**
9292
* Auto return config path
9393
*/
94-
const XML_PATH_ITEM_AUTO_RETURN = 'cataloginventory/item_options/auto_return';
94+
public const XML_PATH_ITEM_AUTO_RETURN = 'cataloginventory/item_options/auto_return';
9595

9696
/**
9797
* Path to configuration option 'Display product stock status'
9898
*/
99-
const XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS = 'cataloginventory/options/display_product_stock_status';
99+
public const XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS = 'cataloginventory/options/display_product_stock_status';
100100

101101
/**
102102
* Threshold qty config path
103103
*/
104-
const XML_PATH_STOCK_THRESHOLD_QTY = 'cataloginventory/options/stock_threshold_qty';
104+
public const XML_PATH_STOCK_THRESHOLD_QTY = 'cataloginventory/options/stock_threshold_qty';
105105

106106
/**
107107
* @var ConfigInterface

‎app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ public function _resetState(): void
236236
/**
237237
* Get search.
238238
*
239-
* @deprecated 100.1.0
240239
* @return \Magento\Search\Api\SearchInterface
241240
*/
242241
private function getSearch()
@@ -250,7 +249,7 @@ private function getSearch()
250249
/**
251250
* Test search.
252251
*
253-
* @deprecated 100.1.0
252+
* @deprecated 100.1.0 @see __construct
254253
* @param \Magento\Search\Api\SearchInterface $object
255254
* @return void
256255
* @since 100.1.0
@@ -263,7 +262,6 @@ public function setSearch(\Magento\Search\Api\SearchInterface $object)
263262
/**
264263
* Set search criteria builder.
265264
*
266-
* @deprecated 100.1.0
267265
* @return \Magento\Framework\Api\Search\SearchCriteriaBuilder
268266
*/
269267
private function getSearchCriteriaBuilder()
@@ -278,7 +276,7 @@ private function getSearchCriteriaBuilder()
278276
/**
279277
* Set search criteria builder.
280278
*
281-
* @deprecated 100.1.0
279+
* @deprecated 100.1.0 @see __construct
282280
* @param \Magento\Framework\Api\Search\SearchCriteriaBuilder $object
283281
* @return void
284282
* @since 100.1.0
@@ -291,7 +289,6 @@ public function setSearchCriteriaBuilder(\Magento\Framework\Api\Search\SearchCri
291289
/**
292290
* Get filter builder.
293291
*
294-
* @deprecated 100.1.0
295292
* @return \Magento\Framework\Api\FilterBuilder
296293
*/
297294
private function getFilterBuilder()
@@ -305,7 +302,7 @@ private function getFilterBuilder()
305302
/**
306303
* Set filter builder.
307304
*
308-
* @deprecated 100.1.0
305+
* @deprecated 100.1.0 @see __construct
309306
* @param \Magento\Framework\Api\FilterBuilder $object
310307
* @return void
311308
* @since 100.1.0

‎app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,16 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
2323
private $indexUsageEnforcements;
2424

2525
/**
26-
* Attribute collection
27-
*
2826
* @var array
2927
*/
3028
protected $_attributesCollection;
3129

3230
/**
33-
* Search query
34-
*
3531
* @var string
3632
*/
3733
protected $_searchQuery;
3834

3935
/**
40-
* Attribute collection factory
41-
*
4236
* @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
4337
*/
4438
protected $_attributeCollectionFactory;
@@ -250,6 +244,8 @@ private function isIndexExists(string $table, string $index) : bool
250244
* @param mixed $query
251245
* @param bool $searchOnlyInCurrentStore Search only in current store or in all stores
252246
* @return string
247+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
248+
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
253249
*/
254250
protected function _getSearchEntityIdsSql($query, $searchOnlyInCurrentStore = true)
255251
{

‎app/code/Magento/Checkout/Model/Session.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class Session extends \Magento\Framework\Session\SessionManager
2626
{
27-
const CHECKOUT_STATE_BEGIN = 'begin';
27+
public const CHECKOUT_STATE_BEGIN = 'begin';
2828

2929
/**
3030
* Quote instance
@@ -99,12 +99,12 @@ class Session extends \Magento\Framework\Session\SessionManager
9999
protected $customerRepository;
100100

101101
/**
102-
* @param QuoteIdMaskFactory
102+
* @var QuoteIdMaskFactory
103103
*/
104104
protected $quoteIdMaskFactory;
105105

106106
/**
107-
* @param bool
107+
* @var bool
108108
*/
109109
protected $isQuoteMasked;
110110

‎app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,11 @@ class Collection extends AbstractCollection
1919
protected $_idFieldName = 'block_id';
2020

2121
/**
22-
* Event prefix
23-
*
2422
* @var string
2523
*/
2624
protected $_eventPrefix = 'cms_block_collection';
2725

2826
/**
29-
* Event object
30-
*
3127
* @var string
3228
*/
3329
protected $_eventObject = 'block_collection';

‎app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@ class Collection extends AbstractCollection
2626
protected $_previewFlag;
2727

2828
/**
29-
* Event prefix
30-
*
3129
* @var string
3230
*/
3331
protected $_eventPrefix = 'cms_page_collection';
3432

3533
/**
36-
* Event object
37-
*
3834
* @var string
3935
*/
4036
protected $_eventObject = 'page_collection';

‎app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* @SuppressWarnings(PHPMD.TooManyFields)
2020
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
2121
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
22+
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
2223
* @since 100.0.2
2324
*/
2425
abstract class AbstractCollection extends AbstractDb implements SourceProviderInterface

0 commit comments

Comments
 (0)