Skip to content

Commit 03b6a61

Browse files
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #13283: Typo cleanup for app (by @akiojalehto) - #13221: CheckoutAgreements getList refactoring (by @sidolov)
2 parents f783440 + d05dc82 commit 03b6a61

File tree

159 files changed

+906
-300
lines changed

Some content is hidden

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

159 files changed

+906
-300
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
{

0 commit comments

Comments
 (0)