Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
8b018bc
Fix typo in comments
akiojalehto Jan 18, 2018
629654b
Fix typo in DocBlock comment
akiojalehto Jan 18, 2018
a72f40c
Fix typos in DocBlock comment
akiojalehto Jan 18, 2018
89a1c55
Fix typos in DocBlock comment
akiojalehto Jan 18, 2018
a83d603
Fix typos in array keys of meta data
akiojalehto Jan 18, 2018
089bf02
Fix typos in DocBlock comment
akiojalehto Jan 18, 2018
4d29ebd
Fix typos in DocBlock comment
akiojalehto Jan 18, 2018
afaf510
Fix typo in method name
akiojalehto Jan 18, 2018
c304dfb
Fix typos in DocBlock comment
akiojalehto Jan 18, 2018
6aec744
Fix typo in property name
akiojalehto Jan 18, 2018
ac10bdb
Fix typos in DocBlock comment
akiojalehto Jan 18, 2018
e2a8fb1
Fix typo in variable name
akiojalehto Jan 18, 2018
bf80051
Fix typos in DocBlock comments
akiojalehto Jan 18, 2018
603b61d
Fix typo in variable name
akiojalehto Jan 18, 2018
4f4c30e
Fix typos in method names
akiojalehto Jan 18, 2018
ceeeda8
Fix typos in DocBlock comments
akiojalehto Jan 18, 2018
3313bd4
Fix typo in variable name
akiojalehto Jan 18, 2018
17aec3e
Fix typo in method name
akiojalehto Jan 18, 2018
795fee6
Fix typos in DocBlock comments
akiojalehto Jan 18, 2018
b35dca6
Fix typos in DocBlock comments
akiojalehto Jan 18, 2018
f5f2d3d
Fix typo in method name
akiojalehto Jan 18, 2018
c66fdd3
Fix typo in variable name
akiojalehto Jan 18, 2018
17c28b8
Fix typo in method name#
akiojalehto Jan 18, 2018
aef3db7
Fix typo in variable name
akiojalehto Jan 18, 2018
047d038
Fix typos in DocBlock comments
akiojalehto Jan 18, 2018
dc72851
Fix typo in variable name
akiojalehto Jan 18, 2018
14f8d2d
Fix typo in method name
akiojalehto Jan 18, 2018
9d4ab4f
Fix typos in DocBlock comments
akiojalehto Jan 18, 2018
cfa32d3
Fix typos in comments
akiojalehto Jan 18, 2018
62a8228
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
533b810
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
964f0d1
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
fcb9ffc
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
ec2a52f
Fix typo in property name
akiojalehto Jan 19, 2018
a18364e
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
9203d32
Fix typos in variable name
akiojalehto Jan 19, 2018
bc8d5cb
Fix typos in method names
akiojalehto Jan 19, 2018
c398fa5
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
3755588
Fix typo in variable name
akiojalehto Jan 19, 2018
bb55f40
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
39599bd
Fix typo in variable name
akiojalehto Jan 19, 2018
d1b5ca9
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
dbba195
Fix typo in method names
akiojalehto Jan 19, 2018
17b9462
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
65d10bf
Fix typo in method names
akiojalehto Jan 19, 2018
d9546dc
Fix typos in DocBlock comments
akiojalehto Jan 19, 2018
99975ed
Fix typo in method name
akiojalehto Jan 19, 2018
8626a46
Fix typo in method name
akiojalehto Jan 19, 2018
20fecef
Fix typos in comments
akiojalehto Jan 19, 2018
8e60a1c
Fix typo in method name
akiojalehto Jan 19, 2018
63d548b
Fix typo in method name
akiojalehto Jan 19, 2018
a8680c5
Fix typo in method names
akiojalehto Jan 19, 2018
0892dbc
Fix typos in comments
akiojalehto Jan 19, 2018
0cb62d3
Fix typo in method names
akiojalehto Jan 19, 2018
17156f6
Fix typos in comments
akiojalehto Jan 19, 2018
421b4dd
Fix typo in property name
akiojalehto Jan 19, 2018
67bf100
Fix typos in comments
akiojalehto Jan 19, 2018
8309e8b
Fix typo in property name
akiojalehto Jan 19, 2018
b1d5548
Fix typos in comments
akiojalehto Jan 19, 2018
78dec58
Fix typo in variable name
akiojalehto Jan 19, 2018
d7a2e39
Fix typo in variable name
akiojalehto Jan 19, 2018
8fef6b7
Fix typos in comments
akiojalehto Jan 19, 2018
c1bc0a3
Fix typo in method names
akiojalehto Jan 19, 2018
c43ef45
Fix typos in comments
akiojalehto Jan 19, 2018
06a5b17
Fix typo in variable name
akiojalehto Jan 19, 2018
b31e6bf
Fix typo in comments
akiojalehto Jan 19, 2018
03c519a
Fix typo in method name
akiojalehto Jan 19, 2018
371c15c
Fix typo in comments
akiojalehto Jan 19, 2018
f2ef300
Fix typo in property name
akiojalehto Jan 19, 2018
0f8902d
Fix typo in method name
akiojalehto Jan 19, 2018
8e7251b
Fix typo in property name
akiojalehto Jan 19, 2018
b9fe26e
Fix typo in variable name
akiojalehto Jan 19, 2018
6ccd693
Fix typo in comments
akiojalehto Jan 19, 2018
f9bd674
Fix typo in variable name
akiojalehto Jan 19, 2018
7b3237b
Fix typo in comments
akiojalehto Jan 19, 2018
fb6da89
Fix typo in method name
akiojalehto Jan 19, 2018
5f8ee52
Fix typo in variable name
akiojalehto Jan 19, 2018
bb4995c
Fix typo in method name
akiojalehto Jan 19, 2018
37fdec1
Fix typo in property name
akiojalehto Jan 19, 2018
4a13339
Revert some changes to pass unit tests?
akiojalehto Jan 19, 2018
2cb7026
Merge remote-tracking branch 'origin/2.3-develop' into fix/typos/batch
akiojalehto Jan 19, 2018
951739b
Suppress warnings on an unused constructor parameter
ishakhsuvarov Jan 20, 2018
5c30560
Update phpDoc with more appropriate description
ishakhsuvarov Jan 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* Flag that notifies whether Primary key of table is auto-incremeted
* Flag that notifies whether Primary key of table is auto-incremented
*
* @var bool
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
/**
* @var \Magento\Backend\Block\Cache\Additional
*/
private $additonalBlock;
private $additionalBlock;

/**
* @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
Expand Down Expand Up @@ -39,7 +39,7 @@ protected function setUp()
]
);

$this->additonalBlock = $objectHelper->getObject(
$this->additionalBlock = $objectHelper->getObject(
\Magento\Backend\Block\Cache\Additional::class,
['context' => $context]
);
Expand All @@ -52,7 +52,7 @@ public function testGetCleanImagesUrl()
->method('getUrl')
->with('*/*/cleanImages')
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->additonalBlock->getCleanImagesUrl());
$this->assertEquals($expectedUrl, $this->additionalBlock->getCleanImagesUrl());
}

public function testGetCleanMediaUrl()
Expand All @@ -62,7 +62,7 @@ public function testGetCleanMediaUrl()
->method('getUrl')
->with('*/*/cleanMedia')
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->additonalBlock->getCleanMediaUrl());
$this->assertEquals($expectedUrl, $this->additionalBlock->getCleanMediaUrl());
}

public function testGetCleanStaticFiles()
Expand All @@ -72,7 +72,7 @@ public function testGetCleanStaticFiles()
->method('getUrl')
->with('*/*/cleanStaticFiles')
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->additonalBlock->getCleanStaticFilesUrl());
$this->assertEquals($expectedUrl, $this->additionalBlock->getCleanStaticFilesUrl());
}

/**
Expand All @@ -85,7 +85,7 @@ public function testIsInProductionMode($mode, $expected)
$this->appStateMock->expects($this->once())
->method('getMode')
->willReturn($mode);
$this->assertEquals($expected, $this->additonalBlock->isInProductionMode());
$this->assertEquals($expected, $this->additionalBlock->isInProductionMode());
}

public function isInProductionModeDataProvider()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function setMaxPrice($maxPrice);

/**
* Set max regular price
* Max regular price is the same, as maximum price, except of excluding calculating special price and catalogules
* Max regular price is the same, as maximum price, except of excluding calculating special price and catalog rules
* in it
*
* @param float $maxRegularPrice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ protected function _prepareForm()
$form = $this->getForm();
/* @var $fieldset \Magento\Framework\Data\Form\Element\Fieldset */
$fieldset = $form->getElement('base_fieldset');
$fiedsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
$fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];

foreach ($fieldset->getElements() as $element) {
/** @var \Magento\Framework\Data\Form\AbstractForm $element */
if (substr($element->getId(), 0, strlen('default_value')) == 'default_value') {
$fiedsToRemove[] = $element->getId();
$fieldsToRemove[] = $element->getId();
}
}
foreach ($fiedsToRemove as $id) {
foreach ($fieldsToRemove as $id) {
$fieldset->removeField($id);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function getProduct()
}

/**
* Get store object of curently edited product
* Get store object of currently edited product
*
* @return \Magento\Store\Model\Store
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ protected function _construct()
}

/**
* Retirve currently edited product model
* Retrieve currently edited product model
*
* @return \Magento\Catalog\Model\Product
*/
Expand Down Expand Up @@ -315,7 +315,7 @@ protected function _prepareColumns()
}

/**
* Rerieve grid URL
* Retrieve grid URL
*
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Navigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public function getCurrentChildCategories()
}

/**
* Checkin activity of category
* Check activity of category
*
* @param \Magento\Framework\DataObject $category
* @return bool
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Magento\Ui\Block\Wrapper;

/**
* Dynamicly creates recently compared widget ui component, using information
* Dynamically creates recently compared widget ui component, using information
* from widget instance and Catalog/widget.xml
*/
class RecentlyCompared extends Wrapper implements \Magento\Widget\Block\BlockInterface
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Magento\Ui\Block\Wrapper;

/**
* Dynamicly creates recently viewed widget ui component, using information
* Dynamically creates recently viewed widget ui component, using information
* from widget instance and Catalog/widget.xml
*/
class RecentlyViewed extends Wrapper implements \Magento\Widget\Block\BlockInterface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

/**
* Cron operation is responsible for deleting all product prices on WEBSITE level
* in case 'Catalog Price Scope' configuratoin parameter is set to GLOBAL.
* in case 'Catalog Price Scope' configuration parameter is set to GLOBAL.
*/
class DeleteOutdatedPriceValues
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Attribure lock state validator
* Attribute lock state validator
*
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Attribure lock state validator interface
* Attribute lock state validator interface
*
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/**
* @api
* Storage, which provide information for frontend storages, as priduct-storage, ids-storag
* Storage, which provide information for frontend storages, as product-storage, ids-storage
* @since 101.1.0
*/
interface FrontendStorageConfigurationInterface
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/Layer.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public function prepareProductCollection($collection)
* Apply layer
* Method is colling after apply all filters, can be used
* for prepare some index data before getting information
* about existing intexes
* about existing indexes
*
* @return \Magento\Catalog\Model\Layer
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/Product/Compare/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public function clean()
}

/**
* Retrieve Customer Id if loggined
* Retrieve Customer Id if logged in
*
* @return int
*/
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi
$mediaAttributeCodes = $this->mediaConfig->getMediaAttributeCodes();

if (is_array($mediaAttribute)) {
foreach ($mediaAttribute as $atttribute) {
if (in_array($atttribute, $mediaAttributeCodes)) {
$product->setData($atttribute, $value);
foreach ($mediaAttribute as $attribute) {
if (in_array($attribute, $mediaAttributeCodes)) {
$product->setData($attribute, $value);
}
}
} elseif (in_array($mediaAttribute, $mediaAttributeCodes)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public function syncActions(array $productsData, $typeId)

/**
* Note that collection is also filtered by visitor id and customer id
* This collection shouldnt be flushed when visitor has products and then login
* This collection shouldn't be flushed when visitor has products and then login
* It can remove only products for visitor, or only products for customer
*
* ['product_id' => 'added_at']
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Model/ResourceModel/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ public function getProduct($productId, $storeId)
}

/**
* Retrieve Product data obects for store
* Retrieve Product data objects for store
*
* @param int $storeId
* @param int &$lastEntityId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function testExecuteWithGenericException()
$this->assertTrue($this->moveController->execute());
}

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

public function testSuccessfullCategorySave()
public function testSuccessfulCategorySave()
{
$messagesCollection = $this->getMockBuilder(\Magento\Framework\Message\Collection::class)
->disableOriginalConstructor()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function testBeforeAndAfterSaveHasChanged()

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

protected function mockConfigFlatEnabledNeever()
protected function mockConfigFlatEnabledNever()
{
$this->stateMock->expects($this->never())->method('isFlatEnabled');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function testGetScopeGlobal()
$this->assertEquals('global', $this->_model->getScope());
}

public function testGetScopeWebiste()
public function testGetScopeWebsite()
{
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->_model = $objectManagerHelper->getObject(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public function testShowMinimalPrice()
{
$minimalPrice = 5.0;
$finalPrice = 10.0;
$displayMininmalPrice = true;
$displayMinimalPrice = true;

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

$this->object->setDisplayMinimalPrice($displayMininmalPrice);
$this->object->setDisplayMinimalPrice($displayMinimalPrice);
$this->assertTrue($this->object->showMinimalPrice());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class OptionTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractIm
const PATH_TO_CSV_FILE = '/_files/product_with_custom_options.csv';

/**
* Test store parametes
* Test store parameters
*
* @var array
*/
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/CatalogSearch/Block/Advanced/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,16 @@ public function getCurrency($attribute)
public function getAttributeInputType($attribute)
{
$dataType = $attribute->getBackend()->getType();
$imputType = $attribute->getFrontend()->getInputType();
if ($imputType == 'select' || $imputType == 'multiselect') {
$inputType = $attribute->getFrontend()->getInputType();
if ($inputType == 'select' || $inputType == 'multiselect') {
return 'select';
}

if ($imputType == 'boolean') {
if ($inputType == 'boolean') {
return 'yesno';
}

if ($imputType == 'price') {
if ($inputType == 'price') {
return 'price';
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected function setUp()
);
}

public function testIsNotAplicable()
public function testIsNotApplicable()
{
$documentIds = [1];
$this->aggregationChecker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function testSavePaymentInformationWithoutBillingAddress()
* @expectedExceptionMessage DB exception
* @expectedException \Magento\Framework\Exception\CouldNotSaveException
*/
public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
{
$cartId = 100;
$email = 'email@magento.com';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ if (!$block->getAgreements()) {
return;
}

/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $argeementsCollection */
$argeementsCollection = $block->getAgreements();
/** @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection $agreementsCollection */
$agreementsCollection = $block->getAgreements();
$agreementMappedArray = [];
/** @var \Magento\CheckoutAgreements\Model\Agreement $agreement */
foreach ($argeementsCollection as $agreement) {
foreach ($agreementsCollection as $agreement) {
if ($agreement->getIsActive()) {
$agreementMappedArray[] = [
'mode' => $agreement->getMode(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function getFilesCount()
}

/**
* File idetifier getter
* File identifier getter
*
* @param \Magento\Framework\DataObject $file
* @return string
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Cms/Helper/Wysiwyg/Images.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
protected $_currentUrl;

/**
* Currenty selected store ID if applicable
* Currently selected store ID if applicable
*
* @var int
*/
Expand Down Expand Up @@ -246,7 +246,7 @@ public function idEncode($string)
}

/**
* Revert opration to idEncode
* Revert operation to idEncode
*
* @param string $string
* @return string
Expand Down
Loading