Skip to content

Commit 8c95a82

Browse files
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-85904-2.3
2 parents e917415 + 8954d07 commit 8c95a82

File tree

243 files changed

+6312
-3029
lines changed

Some content is hidden

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

243 files changed

+6312
-3029
lines changed

app/code/Magento/Backend/Test/Unit/Model/Menu/ConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function testGetMenuWithCachedObjectReturnsUnserializedObject()
9696
$this->assertEquals($this->menuMock, $this->model->getMenu());
9797
}
9898

99-
public function testGetMenuWithNotCachedObjectBuidlsObject()
99+
public function testGetMenuWithNotCachedObjectBuildsObject()
100100
{
101101
$this->cacheInstanceMock->expects(
102102
$this->at(0)

app/code/Magento/Braintree/Test/Unit/Gateway/Config/CanVoidHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testHandleNotOrderPayment()
3939
static::assertFalse($voidHandler->handle($subject));
4040
}
4141

42-
public function testHandleSomeAmoutWasPaid()
42+
public function testHandleSomeAmountWasPaid()
4343
{
4444
$paymentDO = $this->createMock(PaymentDataObjectInterface::class);
4545
$subject = [

app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ public function testGetItemsEmptyCollection()
125125
*/
126126
public function testGetItemsWithLimit()
127127
{
128-
$transations = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
128+
$transactions = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
129129

130130
$this->filterMapperMock->expects($this->once())
131131
->method('getFilter')
132132
->willReturn(new BraintreeSearchNodeStub());
133133

134134
$this->braintreeAdapterMock->expects($this->once())
135135
->method('search')
136-
->willReturn($transations);
136+
->willReturn($transactions);
137137

138138
$this->entityFactoryMock->expects($this->exactly(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT))
139139
->method('create')
@@ -157,15 +157,15 @@ public function testGetItemsWithLimit()
157157
*/
158158
public function testGetItemsWithNullLimit()
159159
{
160-
$transations = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
160+
$transactions = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
161161

162162
$this->filterMapperMock->expects($this->once())
163163
->method('getFilter')
164164
->willReturn(new BraintreeSearchNodeStub());
165165

166166
$this->braintreeAdapterMock->expects($this->once())
167167
->method('search')
168-
->willReturn($transations);
168+
->willReturn($transactions);
169169

170170
$this->entityFactoryMock->expects($this->exactly(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT))
171171
->method('create')

app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ public function testPrepareForCartAdvancedParentClassReturnString()
13651365
/**
13661366
* @return void
13671367
*/
1368-
public function testPrepareForCartAdvancedAllrequiredOption()
1368+
public function testPrepareForCartAdvancedAllRequiredOption()
13691369
{
13701370
/** @var \PHPUnit_Framework_MockObject_MockObject|DefaultType $group */
13711371
$group = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Type\DefaultType::class)

app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<?php $items = $block->getChildren($parentItem) ?>
1414
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
15-
<?php $_count = count($items) ?>
1615
<?php $_index = 0 ?>
1716

1817
<?php $_prevOptionId = '' ?>

app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
1313

1414
<?php $items = $block->getChildren($parentItem) ?>
15-
<?php $_count = count($items) ?>
1615
<?php $_index = 0 ?>
1716

1817
<?php $_prevOptionId = '' ?>

app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
?>
1111
<?php $parentItem = $block->getItem() ?>
1212
<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
13-
<?php $_count = count($items) ?>
1413
<?php $_index = 0 ?>
1514

1615
<?php $_prevOptionId = '' ?>

app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<?php $parentItem = $block->getItem() ?>
1313
<?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
1414
<?php $shipItems = $block->getChildren($parentItem) ?>
15-
<?php $_count = count($items) ?>
1615
<?php $_index = 0 ?>
1716

1817
<?php $_prevOptionId = '' ?>

app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public function execute($entityType, $entity)
7272
$linkedProduct = $this->productRepository->get($entity->getLinkedProductSku());
7373
$product = $this->productRepository->get($entity->getSku());
7474
$linkTypesToId = $this->linkTypeProvider->getLinkTypes();
75-
$prodyctHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
76-
$productData = $prodyctHydrator->extract($product);
75+
$productHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
76+
$productData = $productHydrator->extract($product);
7777
$linkId = $this->linkResource->getProductLinkId(
7878
$productData[$this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()],
7979
$linkedProduct->getId(),

app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public function execute($entityType, $entity)
9797

9898
try {
9999
$linkTypesToId = $this->linkTypeProvider->getLinkTypes();
100-
$prodyctHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
101-
$productData = $prodyctHydrator->extract($product);
100+
$productHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
101+
$productData = $productHydrator->extract($product);
102102
$this->linkResource->saveProductLinks(
103103
$productData[$this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()],
104104
$links,

0 commit comments

Comments
 (0)