Skip to content

Commit 0e6d111

Browse files
ishakhsuvarovishakhsuvarov
committed
MAGETWO-86984: Typo cleanup for app #13283
- Merge Pull Request #13283 from akiojalehto/magento2:fix/typos/batch - Merged commits: 1. 8b018bc 2. 629654b 3. a72f40c 4. 89a1c55 5. a83d603 6. 089bf02 7. 4d29ebd 8. afaf510 9. c304dfb 10. 6aec744 11. ac10bdb 12. e2a8fb1 13. bf80051 14. 603b61d 15. 4f4c30e 16. ceeeda8 17. 3313bd4 18. 17aec3e 19. 795fee6 20. b35dca6 21. f5f2d3d 22. c66fdd3 23. 17c28b8 24. aef3db7 25. 047d038 26. dc72851 27. 14f8d2d 28. 9d4ab4f 29. cfa32d3 30. 62a8228 31. 533b810 32. 964f0d1 33. fcb9ffc 34. ec2a52f 35. a18364e 36. 9203d32 37. bc8d5cb 38. c398fa5 39. 3755588 40. bb55f40 41. 39599bd 42. d1b5ca9 43. dbba195 44. 17b9462 45. 65d10bf 46. d9546dc 47. 99975ed 48. 8626a46 49. 20fecef 50. 8e60a1c 51. 63d548b 52. a8680c5 53. 0892dbc 54. 0cb62d3 55. 17156f6 56. 421b4dd 57. 67bf100 58. 8309e8b 59. b1d5548 60. 78dec58 61. d7a2e39 62. 8fef6b7 63. c1bc0a3 64. c43ef45 65. 06a5b17 66. b31e6bf 67. 03c519a 68. 371c15c 69. f2ef300 70. 0f8902d 71. 8e7251b 72. b9fe26e 73. 6ccd693 74. f9bd674 75. 7b3237b 76. fb6da89 77. 5f8ee52 78. bb4995c 79. 37fdec1 80. 4a13339 81. 2cb7026 82. 951739b 83. 5c30560
2 parents d1ebc31 + 5c30560 commit 0e6d111

File tree

140 files changed

+230
-227
lines changed

Some content is hidden

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

140 files changed

+230
-227
lines changed

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1313
{
1414
/**
15-
* Flag that notifies whether Primary key of table is auto-incremeted
15+
* Flag that notifies whether Primary key of table is auto-incremented
1616
*
1717
* @var bool
1818
*/

‎app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
1111
/**
1212
* @var \Magento\Backend\Block\Cache\Additional
1313
*/
14-
private $additonalBlock;
14+
private $additionalBlock;
1515

1616
/**
1717
* @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -39,7 +39,7 @@ protected function setUp()
3939
]
4040
);
4141

42-
$this->additonalBlock = $objectHelper->getObject(
42+
$this->additionalBlock = $objectHelper->getObject(
4343
\Magento\Backend\Block\Cache\Additional::class,
4444
['context' => $context]
4545
);
@@ -52,7 +52,7 @@ public function testGetCleanImagesUrl()
5252
->method('getUrl')
5353
->with('*/*/cleanImages')
5454
->will($this->returnValue($expectedUrl));
55-
$this->assertEquals($expectedUrl, $this->additonalBlock->getCleanImagesUrl());
55+
$this->assertEquals($expectedUrl, $this->additionalBlock->getCleanImagesUrl());
5656
}
5757

5858
public function testGetCleanMediaUrl()
@@ -62,7 +62,7 @@ public function testGetCleanMediaUrl()
6262
->method('getUrl')
6363
->with('*/*/cleanMedia')
6464
->will($this->returnValue($expectedUrl));
65-
$this->assertEquals($expectedUrl, $this->additonalBlock->getCleanMediaUrl());
65+
$this->assertEquals($expectedUrl, $this->additionalBlock->getCleanMediaUrl());
6666
}
6767

6868
public function testGetCleanStaticFiles()
@@ -72,7 +72,7 @@ public function testGetCleanStaticFiles()
7272
->method('getUrl')
7373
->with('*/*/cleanStaticFiles')
7474
->will($this->returnValue($expectedUrl));
75-
$this->assertEquals($expectedUrl, $this->additonalBlock->getCleanStaticFilesUrl());
75+
$this->assertEquals($expectedUrl, $this->additionalBlock->getCleanStaticFilesUrl());
7676
}
7777

7878
/**
@@ -85,7 +85,7 @@ public function testIsInProductionMode($mode, $expected)
8585
$this->appStateMock->expects($this->once())
8686
->method('getMode')
8787
->willReturn($mode);
88-
$this->assertEquals($expected, $this->additonalBlock->isInProductionMode());
88+
$this->assertEquals($expected, $this->additionalBlock->isInProductionMode());
8989
}
9090

9191
public function isInProductionModeDataProvider()

‎app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function setMaxPrice($maxPrice);
5151

5252
/**
5353
* Set max regular price
54-
* Max regular price is the same, as maximum price, except of excluding calculating special price and catalogules
54+
* Max regular price is the same, as maximum price, except of excluding calculating special price and catalog rules
5555
* in it
5656
*
5757
* @param float $maxRegularPrice

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ protected function _prepareForm()
3535
$form = $this->getForm();
3636
/* @var $fieldset \Magento\Framework\Data\Form\Element\Fieldset */
3737
$fieldset = $form->getElement('base_fieldset');
38-
$fiedsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
38+
$fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
3939

4040
foreach ($fieldset->getElements() as $element) {
4141
/** @var \Magento\Framework\Data\Form\AbstractForm $element */
4242
if (substr($element->getId(), 0, strlen('default_value')) == 'default_value') {
43-
$fiedsToRemove[] = $element->getId();
43+
$fieldsToRemove[] = $element->getId();
4444
}
4545
}
46-
foreach ($fiedsToRemove as $id) {
46+
foreach ($fieldsToRemove as $id) {
4747
$fieldset->removeField($id);
4848
}
4949

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function getProduct()
8080
}
8181

8282
/**
83-
* Get store object of curently edited product
83+
* Get store object of currently edited product
8484
*
8585
* @return \Magento\Store\Model\Store
8686
*/

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected function _construct()
104104
}
105105

106106
/**
107-
* Retirve currently edited product model
107+
* Retrieve currently edited product model
108108
*
109109
* @return \Magento\Catalog\Model\Product
110110
*/
@@ -315,7 +315,7 @@ protected function _prepareColumns()
315315
}
316316

317317
/**
318-
* Rerieve grid URL
318+
* Retrieve grid URL
319319
*
320320
* @return string
321321
*/

‎app/code/Magento/Catalog/Block/Navigation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public function getCurrentChildCategories()
195195
}
196196

197197
/**
198-
* Checkin activity of category
198+
* Check activity of category
199199
*
200200
* @param \Magento\Framework\DataObject $category
201201
* @return bool

‎app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Magento\Ui\Block\Wrapper;
99

1010
/**
11-
* Dynamicly creates recently compared widget ui component, using information
11+
* Dynamically creates recently compared widget ui component, using information
1212
* from widget instance and Catalog/widget.xml
1313
*/
1414
class RecentlyCompared extends Wrapper implements \Magento\Widget\Block\BlockInterface

‎app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Magento\Ui\Block\Wrapper;
99

1010
/**
11-
* Dynamicly creates recently viewed widget ui component, using information
11+
* Dynamically creates recently viewed widget ui component, using information
1212
* from widget instance and Catalog/widget.xml
1313
*/
1414
class RecentlyViewed extends Wrapper implements \Magento\Widget\Block\BlockInterface

‎app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/**
1515
* Cron operation is responsible for deleting all product prices on WEBSITE level
16-
* in case 'Catalog Price Scope' configuratoin parameter is set to GLOBAL.
16+
* in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
1717
*/
1818
class DeleteOutdatedPriceValues
1919
{

‎app/code/Magento/Catalog/Model/Attribute/LockValidatorComposite.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Attribure lock state validator
3+
* Attribute lock state validator
44
*
55
* Copyright © Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.

‎app/code/Magento/Catalog/Model/Attribute/LockValidatorInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Attribure lock state validator interface
3+
* Attribute lock state validator interface
44
*
55
* Copyright © Magento, Inc. All rights reserved.
66
* See COPYING.txt for license details.

‎app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/**
1010
* @api
11-
* Storage, which provide information for frontend storages, as priduct-storage, ids-storag
11+
* Storage, which provide information for frontend storages, as product-storage, ids-storage
1212
* @since 101.1.0
1313
*/
1414
interface FrontendStorageConfigurationInterface

‎app/code/Magento/Catalog/Model/Layer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function prepareProductCollection($collection)
168168
* Apply layer
169169
* Method is colling after apply all filters, can be used
170170
* for prepare some index data before getting information
171-
* about existing intexes
171+
* about existing indexes
172172
*
173173
* @return \Magento\Catalog\Model\Layer
174174
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public function clean()
220220
}
221221

222222
/**
223-
* Retrieve Customer Id if loggined
223+
* Retrieve Customer Id if logged in
224224
*
225225
* @return int
226226
*/

‎app/code/Magento/Catalog/Model/Product/Gallery/Processor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,9 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi
340340
$mediaAttributeCodes = $this->mediaConfig->getMediaAttributeCodes();
341341

342342
if (is_array($mediaAttribute)) {
343-
foreach ($mediaAttribute as $atttribute) {
344-
if (in_array($atttribute, $mediaAttributeCodes)) {
345-
$product->setData($atttribute, $value);
343+
foreach ($mediaAttribute as $attribute) {
344+
if (in_array($attribute, $mediaAttributeCodes)) {
345+
$product->setData($attribute, $value);
346346
}
347347
}
348348
} elseif (in_array($mediaAttribute, $mediaAttributeCodes)) {

‎app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function syncActions(array $productsData, $typeId)
163163

164164
/**
165165
* Note that collection is also filtered by visitor id and customer id
166-
* This collection shouldnt be flushed when visitor has products and then login
166+
* This collection shouldn't be flushed when visitor has products and then login
167167
* It can remove only products for visitor, or only products for customer
168168
*
169169
* ['product_id' => 'added_at']

‎app/code/Magento/Catalog/Model/ResourceModel/Url.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ public function getProduct($productId, $storeId)
621621
}
622622

623623
/**
624-
* Retrieve Product data obects for store
624+
* Retrieve Product data objects for store
625625
*
626626
* @param int $storeId
627627
* @param int &$lastEntityId

‎app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function testExecuteWithGenericException()
173173
$this->assertTrue($this->moveController->execute());
174174
}
175175

176-
public function testExecuteWithLocaliedException()
176+
public function testExecuteWithLocalizedException()
177177
{
178178
$exceptionMessage = 'Sorry, but we can\'t find the new category you selected.';
179179
$messagesCollection = $this->getMockBuilder(\Magento\Framework\Message\Collection::class)
@@ -246,7 +246,7 @@ public function testExecuteWithLocaliedException()
246246
$this->assertTrue($this->moveController->execute());
247247
}
248248

249-
public function testSuccessfullCategorySave()
249+
public function testSuccessfulCategorySave()
250250
{
251251
$messagesCollection = $this->getMockBuilder(\Magento\Framework\Message\Collection::class)
252252
->disableOriginalConstructor()

‎app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function testBeforeAndAfterSaveHasChanged()
8888

8989
public function testBeforeAndAfterSaveNoNeed()
9090
{
91-
$this->mockConfigFlatEnabledNeever();
91+
$this->mockConfigFlatEnabledNever();
9292
$storeMock = $this->createPartialMock(
9393
\Magento\Store\Model\Store::class,
9494
['isObjectNew', 'dataHasChangedFor', '__wakeup']
@@ -114,7 +114,7 @@ protected function mockConfigFlatEnabled()
114114
$this->stateMock->expects($this->once())->method('isFlatEnabled')->will($this->returnValue(true));
115115
}
116116

117-
protected function mockConfigFlatEnabledNeever()
117+
protected function mockConfigFlatEnabledNever()
118118
{
119119
$this->stateMock->expects($this->never())->method('isFlatEnabled');
120120
}

‎app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function testGetScopeGlobal()
173173
$this->assertEquals('global', $this->_model->getScope());
174174
}
175175

176-
public function testGetScopeWebiste()
176+
public function testGetScopeWebsite()
177177
{
178178
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
179179
$this->_model = $objectManagerHelper->getObject(

‎app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public function testShowMinimalPrice()
359359
{
360360
$minimalPrice = 5.0;
361361
$finalPrice = 10.0;
362-
$displayMininmalPrice = true;
362+
$displayMinimalPrice = true;
363363

364364
$this->minimalPriceCalculator->expects($this->once())->method('getValue')->with($this->product)
365365
->willReturn($minimalPrice);
@@ -379,7 +379,7 @@ public function testShowMinimalPrice()
379379
->with(FinalPrice::PRICE_CODE)
380380
->willReturn($finalPriceType);
381381

382-
$this->object->setDisplayMinimalPrice($displayMininmalPrice);
382+
$this->object->setDisplayMinimalPrice($displayMinimalPrice);
383383
$this->assertTrue($this->object->showMinimalPrice());
384384
}
385385

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class OptionTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
1919
const PATH_TO_CSV_FILE = '/_files/product_with_custom_options.csv';
2020

2121
/**
22-
* Test store parametes
22+
* Test store parameters
2323
*
2424
* @var array
2525
*/

‎app/code/Magento/CatalogSearch/Block/Advanced/Form.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,16 @@ public function getCurrency($attribute)
201201
public function getAttributeInputType($attribute)
202202
{
203203
$dataType = $attribute->getBackend()->getType();
204-
$imputType = $attribute->getFrontend()->getInputType();
205-
if ($imputType == 'select' || $imputType == 'multiselect') {
204+
$inputType = $attribute->getFrontend()->getInputType();
205+
if ($inputType == 'select' || $inputType == 'multiselect') {
206206
return 'select';
207207
}
208208

209-
if ($imputType == 'boolean') {
209+
if ($inputType == 'boolean') {
210210
return 'yesno';
211211
}
212212

213-
if ($imputType == 'price') {
213+
if ($inputType == 'price') {
214214
return 'price';
215215
}
216216

‎app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function setUp()
8787
);
8888
}
8989

90-
public function testIsNotAplicable()
90+
public function testIsNotApplicable()
9191
{
9292
$documentIds = [1];
9393
$this->aggregationChecker

‎app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function testSavePaymentInformationWithoutBillingAddress()
162162
* @expectedExceptionMessage DB exception
163163
* @expectedException \Magento\Framework\Exception\CouldNotSaveException
164164
*/
165-
public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
165+
public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
166166
{
167167
$cartId = 100;
168168
$email = 'email@magento.com';

‎app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ if (!$block->getAgreements()) {
1313
return;
1414
}
1515

16-
/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $argeementsCollection */
17-
$argeementsCollection = $block->getAgreements();
16+
/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $agreementsCollection */
17+
$agreementsCollection = $block->getAgreements();
1818
$agreementMappedArray = [];
1919
/** @var \Magento\CheckoutAgreements\Model\Agreement $agreement */
20-
foreach ($argeementsCollection as $agreement) {
20+
foreach ($agreementsCollection as $agreement) {
2121
if ($agreement->getIsActive()) {
2222
$agreementMappedArray[] = [
2323
'mode' => $agreement->getMode(),

‎app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function getFilesCount()
7575
}
7676

7777
/**
78-
* File idetifier getter
78+
* File identifier getter
7979
*
8080
* @param \Magento\Framework\DataObject $file
8181
* @return string

‎app/code/Magento/Cms/Helper/Wysiwyg/Images.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
2525
protected $_currentUrl;
2626

2727
/**
28-
* Currenty selected store ID if applicable
28+
* Currently selected store ID if applicable
2929
*
3030
* @var int
3131
*/
@@ -246,7 +246,7 @@ public function idEncode($string)
246246
}
247247

248248
/**
249-
* Revert opration to idEncode
249+
* Revert operation to idEncode
250250
*
251251
* @param string $string
252252
* @return string

0 commit comments

Comments
 (0)