Skip to content

Commit 0b9e5a6

Browse files
engcom-Dashengcom-Dash
committed
Merge remote-tracking branch '31398/2.4-develop-phpdoc-correction-spelling' into novcommpr-3
2 parents ef5284e + 4885e82 commit 0b9e5a6

File tree

84 files changed

+307
-287
lines changed

Some content is hidden

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

84 files changed

+307
-287
lines changed

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

Lines changed: 12 additions & 12 deletions
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
{

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

Lines changed: 4 additions & 3 deletions
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
{

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

Lines changed: 3 additions & 3 deletions
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
{

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

Lines changed: 3 additions & 3 deletions
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
{

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

Lines changed: 3 additions & 3 deletions
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
{

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

Lines changed: 3 additions & 4 deletions
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
{

‎app/code/Magento/Elasticsearch7/Model/Adapter/DynamicTemplates/IntegerMapper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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

88
namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;
99

1010
/**
11-
* @inheridoc
11+
* @inheritDoc
1212
* @deprecated because of EOL for Elasticsearch7
1313
* @see this class will be responsible for ES7 only
1414
*/

‎app/code/Magento/Elasticsearch7/Model/Adapter/DynamicTemplates/PositionMapper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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

88
namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;
99

1010
/**
11-
* @inheridoc
11+
* @inheritDoc
1212
* @deprecated because of EOL for Elasticsearch7
1313
* @see this class will be responsible for ES7 only
1414
*/

‎app/code/Magento/Elasticsearch7/Model/Adapter/DynamicTemplates/PriceMapper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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

88
namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;
99

1010
/**
11-
* @inheridoc
11+
* @inheritDoc
1212
* @deprecated because of EOL for Elasticsearch7
1313
* @see this class will be responsible for ES7 only
1414
*/

‎app/code/Magento/Elasticsearch7/Model/Adapter/DynamicTemplates/StringMapper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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

88
namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;
99

1010
/**
11-
* @inheridoc
11+
* @inheritDoc
1212
* @deprecated because of EOL for Elasticsearch7
1313
* @see this class will be responsible for ES7 only
1414
*/

0 commit comments

Comments
 (0)