Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - #13283: Typo cleanup for app (by @akiojalehto)
 - #13221: CheckoutAgreements getList refactoring (by @sidolov)
  • Loading branch information
magento-team authored Jan 22, 2018
2 parents f783440 + d05dc82 commit 03b6a61
Show file tree
Hide file tree
Showing 159 changed files with 906 additions and 300 deletions.
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
@@ -0,0 +1,26 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\CheckoutAgreements\Api;

/**
* Interface for retrieving list of checkout agreements.
*
* Extended variation of CheckoutAgreementsRepositoryInterface::getList with possibility to get results according
* search filters without predefined limitations.
*
* @api
*/
interface CheckoutAgreementsListInterface
{
/**
* List of checkout agreements.
*
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
* @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
*/
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) : array;
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public function get($id, $storeId = null);
* Lists active checkout agreements.
*
* @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
* @deprecated
* @see \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::getList
*/
public function getList();

Expand Down
Loading

0 comments on commit 03b6a61

Please sign in to comment.