Skip to content

Commit 63ff429

Browse files
andrewbessandrewbess
authored
Merge pull request #7677 from magento-atwix-pyrrans/delivery-bunch-w22
[Pyrrans] Delivery bunch 2022`W22
2 parents e897727 + 68561b7 commit 63ff429

File tree

219 files changed

+973
-826
lines changed

Some content is hidden

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

219 files changed

+973
-826
lines changed

‎app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
*/
1919
class OrderFilter
2020
{
21-
/**
22-
* @var ScopeConfigInterface
23-
*/
24-
private $scopeConfig;
25-
2621
/**
2722
* Translator field from graphql to collection field
2823
*
@@ -47,6 +42,8 @@ class OrderFilter
4742
* @param FilterBuilder $filterBuilder
4843
* @param FilterGroupBuilder $filterGroupBuilder
4944
* @param string[] $fieldTranslatorArray
45+
*
46+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5047
*/
5148
public function __construct(
5249
ScopeConfigInterface $scopeConfig,
@@ -56,7 +53,6 @@ public function __construct(
5653
) {
5754
$this->filterBuilder = $filterBuilder;
5855
$this->filterGroupBuilder = $filterGroupBuilder;
59-
$this->scopeConfig = $scopeConfig;
6056
$this->fieldTranslatorArray = array_replace($this->fieldTranslatorArray, $fieldTranslatorArray);
6157
}
6258

@@ -95,7 +91,7 @@ public function createFilterGroups(
9591
if (is_array($value)) {
9692
throw new InputException(__('Invalid match filter'));
9793
}
98-
$searchValue = str_replace('%', '', $value);
94+
$searchValue = $value !== null ? str_replace('%', '', $value) : '';
9995
$filters[] = $this->filterBuilder->setField($field)
10096
->setValue("%{$searchValue}%")
10197
->setConditionType('like')

‎app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ class NewActionHtml extends Quote implements HttpPostActionInterface
2222
*/
2323
public function execute()
2424
{
25-
$id = $this->getRequest()
26-
->getParam('id');
27-
$formName = $this->getRequest()
28-
->getParam('form_namespace');
29-
$typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
25+
$id = $this->getRequest()->getParam('id');
26+
$formName = $this->getRequest()->getParam('form_namespace');
27+
$typeArr = explode(
28+
'|',
29+
str_replace('-', '/', $this->getRequest()->getParam('type', ''))
30+
);
3031
$type = $typeArr[0];
3132

3233
$model = $this->_objectManager->create(

‎app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ public function execute()
2323
{
2424
$id = $this->getRequest()->getParam('id');
2525
$formName = $this->getRequest()->getParam('form_namespace');
26-
$typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
26+
$typeArr = explode(
27+
'|',
28+
str_replace('-', '/', $this->getRequest()->getParam('type', ''))
29+
);
2730
$type = $typeArr[0];
2831

2932
$model = $this->_objectManager->create(

‎app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected function _addSpecialAttributes(array &$attributes)
3838
public function getAttribute(): string
3939
{
4040
$attribute = $this->getData('attribute');
41-
if (strpos($attribute, '::') !== false) {
41+
if ($attribute !== null && strpos($attribute, '::') !== false) {
4242
list(, $attribute) = explode('::', $attribute);
4343
}
4444

‎app/code/Magento/SampleData/Model/Dependency.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Dependency
2222
/**
2323
* Sample data version text
2424
*/
25-
const SAMPLE_DATA_SUGGEST = 'Sample Data version:';
25+
public const SAMPLE_DATA_SUGGEST = 'Sample Data version:';
2626

2727
/**
2828
* @var ComposerInformation
@@ -80,7 +80,7 @@ public function getSampleDataPackages()
8080
$suggests = $this->composerInformation->getSuggestedPackages();
8181
$suggests = array_merge($suggests, $this->getSuggestsFromModules());
8282
foreach ($suggests as $name => $version) {
83-
if (strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
83+
if ($version !== null && strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
8484
$installExtensions[$name] = trim(substr($version, strlen(self::SAMPLE_DATA_SUGGEST)));
8585
}
8686
}

‎app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88

99
use Magento\Search\Model\Synonym\MergeConflictException;
1010

11+
/**
12+
* @SuppressWarnings(PHPMD.AllPurposeAction)
13+
*/
1114
class Save extends \Magento\Backend\App\Action
1215
{
1316
/**
1417
* Authorization level of a basic admin session
1518
*
1619
* @see _isAllowed()
1720
*/
18-
const ADMIN_RESOURCE = 'Magento_Search::synonyms';
21+
public const ADMIN_RESOURCE = 'Magento_Search::synonyms';
1922

2023
/**
2124
* @var \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
@@ -66,12 +69,12 @@ public function execute()
6669
// Pre-process data and save it to model
6770
// Extract website_id and store_id out of scope_id
6871
// scope_id = website_id:store_id
69-
$tokens = explode(':', $data['scope_id']);
72+
$tokens = explode(':', $data['scope_id'] ?? '');
7073
$data['website_id'] = $tokens[0];
7174
$data['store_id'] = $tokens[1];
7275

7376
// Remove unnecessary white spaces and convert synonyms to lower case
74-
$words = explode(',', $data['synonyms']);
77+
$words = explode(',', $data['synonyms'] ?? '');
7578
$words = array_map('trim', $words);
7679
$data['synonyms'] = strtolower(implode(',', $words));
7780

‎app/code/Magento/Search/Model/ResourceModel/SynonymReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct(
5252
*/
5353
public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phrase)
5454
{
55-
$rows = $this->queryByPhrase(strtolower($phrase));
55+
$rows = $this->queryByPhrase($phrase !== null ? strtolower($phrase) : '');
5656
$synsPerScope = $this->getSynRowsPerScope($rows);
5757

5858
if (!empty($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_STORES])) {

‎app/code/Magento/Search/Model/SynonymAnalyzer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getSynonymsForPhrase($phrase)
5151
{
5252
$result = [];
5353

54-
if (empty(trim($phrase))) {
54+
if ($phrase === null || empty(trim($phrase))) {
5555
return $result;
5656
}
5757

@@ -71,7 +71,7 @@ public function getSynonymsForPhrase($phrase)
7171
$pattern = $this->getSearchPattern(\array_slice($words, $offset));
7272
$position = $this->findInArray($pattern, $synonymGroups);
7373
if ($position !== null) {
74-
$synonyms = explode(',', $synonymGroups[$position]);
74+
$synonyms = explode(',', $synonymGroups[$position] ?? '');
7575
}
7676
}
7777

@@ -94,7 +94,7 @@ private function findInArray(string $pattern, array $synonymGroupsToExamine)
9494
{
9595
$position = 0;
9696
foreach ($synonymGroupsToExamine as $synonymGroup) {
97-
$matchingResultCode = preg_match($pattern, $synonymGroup);
97+
$matchingResultCode = preg_match($pattern, $synonymGroup ?? '');
9898
if ($matchingResultCode === 1) {
9999
return $position;
100100
}

‎app/code/Magento/Search/Model/SynonymGroupRepository.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
class SynonymGroupRepository implements SynonymGroupRepositoryInterface
1919
{
2020
/**
21-
* SynonymGroup Factory
22-
*
2321
* @var SynonymGroupFactory
2422
*/
2523
protected $synonymGroupFactory;
@@ -155,10 +153,10 @@ private function merge(SynonymGroupInterface $synonymGroupToMerge, array $matchi
155153
/** @var SynonymGroup $synonymGroupModel */
156154
$synonymGroupModel = $this->synonymGroupFactory->create();
157155
$synonymGroupModel->load($groupId);
158-
$mergedSynonyms[] = explode(',', $synonymGroupModel->getSynonymGroup());
156+
$mergedSynonyms[] = explode(',', $synonymGroupModel->getSynonymGroup() ?? '');
159157
$synonymGroupModel->delete();
160158
}
161-
$mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup());
159+
$mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup() ?? '');
162160

163161
return array_unique(array_merge([], ...$mergedSynonyms));
164162
}
@@ -243,7 +241,7 @@ private function parseToArray($matchingSynonymGroups)
243241
{
244242
$parsedArray = [];
245243
foreach ($matchingSynonymGroups as $matchingSynonymGroup) {
246-
$parsedArray[] = explode(',', $matchingSynonymGroup);
244+
$parsedArray[] = explode(',', (string)$matchingSynonymGroup);
247245
}
248246
return $parsedArray;
249247
}
@@ -263,8 +261,8 @@ private function getMatchingSynonymGroups(SynonymGroupInterface $synonymGroup)
263261
$matchingSynonymGroups = [];
264262
foreach ($synonymGroupsInScope as $synonymGroupInScope) {
265263
if (array_intersect(
266-
explode(',', $synonymGroup->getSynonymGroup()),
267-
explode(',', $synonymGroupInScope['synonyms'])
264+
explode(',', $synonymGroup->getSynonymGroup() ?? ''),
265+
explode(',', $synonymGroupInScope['synonyms'] ?? '')
268266
)) {
269267
$matchingSynonymGroups[$synonymGroupInScope['group_id']] = $synonymGroupInScope['synonyms'];
270268
}

‎app/code/Magento/Search/Model/SynonymReader.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
namespace Magento\Search\Model;
77

8-
use Magento\Framework\App\ResourceConnection;
98
use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
109
use Magento\Framework\Model\AbstractModel;
1110
use Magento\Framework\Model\ResourceModel\AbstractResource;
@@ -28,8 +27,6 @@
2827
class SynonymReader extends AbstractModel
2928
{
3029
/**
31-
* Event prefix
32-
*
3330
* @var string
3431
* @since 100.1.0
3532
*/
@@ -52,7 +49,7 @@ class SynonymReader extends AbstractModel
5249
* @param DbCollection $resourceCollection
5350
* @param array $data
5451
*/
55-
public function __construct(
52+
public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
5653
\Magento\Framework\Model\Context $context,
5754
Registry $registry,
5855
AbstractResource $resource = null,
@@ -83,7 +80,7 @@ protected function _construct()
8380
*/
8481
public function loadByPhrase($phrase)
8582
{
86-
$this->_getResource()->loadByPhrase($this, strtolower($phrase));
83+
$this->_getResource()->loadByPhrase($this, $phrase !== null ? strtolower($phrase) : '');
8784
$this->_afterLoad();
8885
$this->setOrigData();
8986
return $this;

0 commit comments

Comments
 (0)