Skip to content

Commit f3e6674

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #9385 from magento-gl/novcommpr-3
[Bluetooth] Community Pull Requests delivery Nov-3
2 parents d3511ca + ae5b642 commit f3e6674

File tree

89 files changed

+374
-319
lines changed

Some content is hidden

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

89 files changed

+374
-319
lines changed

Diff for: ‎app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2021 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -13,72 +13,72 @@
1313
class DummyMetadataCache implements \Magento\RemoteStorage\Driver\Adapter\Cache\CacheInterface
1414
{
1515
/**
16-
* @inheirtDoc
16+
* @inheritDoc
1717
*/
1818
public function exists(string $path): ?bool
1919
{
2020
return null;
2121
}
2222

2323
/**
24-
* @inheirtDoc
24+
* @inheritDoc
2525
*/
2626
public function getMetadata(string $path): ?array
2727
{
2828
return null;
2929
}
3030

3131
/**
32-
* @inheirtDoc
32+
* @inheritDoc
3333
*/
3434
public function flushCache(): void
3535
{
3636
}
3737

3838
/**
39-
* @inheirtDoc
39+
* @inheritDoc
4040
*/
4141
public function purgeQueue(): void
4242
{
4343
}
4444

4545
/**
46-
* @inheirtDoc
46+
* @inheritDoc
4747
*/
4848
public function moveFile(string $path, string $newpath): void
4949
{
5050
}
5151

5252
/**
53-
* @inheirtDoc
53+
* @inheritDoc
5454
*/
5555
public function copyFile(string $path, string $newpath): void
5656
{
5757
}
5858

5959
/**
60-
* @inheirtDoc
60+
* @inheritDoc
6161
*/
6262
public function deleteFile(string $path): void
6363
{
6464
}
6565

6666
/**
67-
* @inheirtDoc
67+
* @inheritDoc
6868
*/
6969
public function deleteDir(string $dirname): void
7070
{
7171
}
7272

7373
/**
74-
* @inheirtDoc
74+
* @inheritDoc
7575
*/
7676
public function updateMetadata(string $path, array $objectMetadata, bool $persist = false): void
7777
{
7878
}
7979

8080
/**
81-
* @inheirtDoc
81+
* @inheritDoc
8282
*/
8383
public function storeFileNotExists(string $path): void
8484
{

Diff for: ‎app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Catalog\Model\Product\Type;
@@ -241,12 +241,13 @@ public function getRelationInfo()
241241
* group => array(ids)
242242
* )
243243
*
244-
* @deplacated TODO: refactor to child relation manager
244+
* @deprecated TODO: refactor to child relation manager
245245
*
246246
* @param int $parentId
247247
* @param bool $required
248248
* @return array
249249
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
250+
* @see Nothing
250251
*/
251252
public function getChildrenIds($parentId, $required = true)
252253
{

Diff for: ‎app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -70,7 +70,7 @@ class CategoryRepositoryTest extends TestCase
7070
private $populateWithValuesMock;
7171

7272
/**
73-
* @inheridoc
73+
* @inheritDoc
7474
*/
7575
protected function setUp(): void
7676
{

Diff for: ‎app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2016 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -46,7 +46,7 @@ class SaveHandlerTest extends TestCase
4646
private $relationMock;
4747

4848
/**
49-
* @inheridoc
49+
* @inheritDoc
5050
*/
5151
protected function setUp(): void
5252
{

Diff for: ‎app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/AttributeTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -64,7 +64,7 @@ class AttributeTest extends TestCase
6464
private $eavConfig;
6565

6666
/**
67-
* @inheridoc
67+
* @inheritDoc
6868
*/
6969
protected function setUp(): void
7070
{

Diff for: ‎app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
2-
32
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
3+
* Copyright 2016 Adobe
4+
* All Rights Reserved.
65
*/
76
declare(strict_types=1);
87

@@ -84,7 +83,7 @@ class SaveTest extends TestCase
8483
private $pageId = 1;
8584

8685
/**
87-
* @inheirtDoc
86+
* @inheritDoc
8887
*/
8988
protected function setUp(): void
9089
{

Diff for: ‎app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\ConfigurableProduct\Block\Product\View\Type;
77

@@ -34,6 +34,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
3434
* Current customer
3535
*
3636
* @deprecated 100.2.0 as unused property
37+
* @see Nothing
3738
* @var CurrentCustomer
3839
*/
3940
protected $currentCustomer;
@@ -49,7 +50,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
4950
protected $jsonEncoder;
5051

5152
/**
52-
* @var \Magento\ConfigurableProduct\Helper\Data $imageHelper
53+
* @var \Magento\ConfigurableProduct\Helper\Data
5354
*/
5455
protected $helper;
5556

@@ -359,6 +360,7 @@ private function getTierPricesByProduct(ProductInterface $product): array
359360
* Replace ',' on '.' for js
360361
*
361362
* @deprecated 100.1.10 Will be removed in major release
363+
* @see Nothing
362364
* @param float $price
363365
* @return string
364366
*/

Diff for: ‎app/code/Magento/Csp/Model/Mode/ConfigManager.php

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -11,7 +11,7 @@
1111
use Magento\Framework\App\ObjectManager;
1212
use Magento\Csp\Api\Data\ModeConfiguredInterface;
1313
use Magento\Csp\Api\ModeConfigManagerInterface;
14-
use Magento\Csp\Model\Mode\Data\ModeConfigured;
14+
use Magento\Csp\Model\Mode\Data\ModeConfiguredFactory;
1515
use Magento\Framework\App\Area;
1616
use Magento\Framework\App\Config\ScopeConfigInterface;
1717
use Magento\Framework\App\State;
@@ -43,24 +43,33 @@ class ConfigManager implements ModeConfigManagerInterface
4343
*/
4444
private Http $request;
4545

46+
/**
47+
* @var ModeConfiguredFactory
48+
*/
49+
private $modeConfiguredFactory;
50+
4651
/**
4752
* @param ScopeConfigInterface $config
4853
* @param Store $store
4954
* @param State $state
5055
* @param Http|null $request
56+
* @param ModeConfiguredFactory|null $modeConfiguredFactory
5157
*/
5258
public function __construct(
5359
ScopeConfigInterface $config,
5460
Store $store,
5561
State $state,
56-
?Http $request = null
62+
?Http $request = null,
63+
?ModeConfiguredFactory $modeConfiguredFactory = null
5764
) {
5865
$this->config = $config;
5966
$this->storeModel = $store;
6067
$this->state = $state;
6168

6269
$this->request = $request
6370
?? ObjectManager::getInstance()->get(Http::class);
71+
$this->modeConfiguredFactory = $modeConfiguredFactory
72+
?? ObjectManager::getInstance()->get(ModeConfiguredFactory::class);
6473
}
6574

6675
/**
@@ -118,9 +127,9 @@ public function getConfigured(): ModeConfiguredInterface
118127
);
119128
}
120129

121-
return new ModeConfigured(
122-
(bool) $reportOnly,
123-
!empty($reportUri) ? $reportUri : null
124-
);
130+
return $this->modeConfiguredFactory->create([
131+
'reportOnly' => (bool) $reportOnly,
132+
'reportUri' => !empty($reportUri) ? (string)$reportUri : null
133+
]);
125134
}
126135
}

0 commit comments

Comments
 (0)