Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-85904-2.3

Author: AVoskoboinikov

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

@@ -96,7 +96,7 @@ public function testGetMenuWithCachedObjectReturnsUnserializedObject()
         $this->assertEquals($this->menuMock, $this->model->getMenu());
     }
 
-    public function testGetMenuWithNotCachedObjectBuidlsObject()
+    public function testGetMenuWithNotCachedObjectBuildsObject()
     {
         $this->cacheInstanceMock->expects(
             $this->at(0)

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

@@ -39,7 +39,7 @@ public function testHandleNotOrderPayment()
         static::assertFalse($voidHandler->handle($subject));
     }
 
-    public function testHandleSomeAmoutWasPaid()
+    public function testHandleSomeAmountWasPaid()
     {
         $paymentDO = $this->createMock(PaymentDataObjectInterface::class);
         $subject = [

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

@@ -125,15 +125,15 @@ public function testGetItemsEmptyCollection()
      */
     public function testGetItemsWithLimit()
     {
-        $transations = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
+        $transactions = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
 
         $this->filterMapperMock->expects($this->once())
             ->method('getFilter')
             ->willReturn(new BraintreeSearchNodeStub());
 
         $this->braintreeAdapterMock->expects($this->once())
             ->method('search')
-            ->willReturn($transations);
+            ->willReturn($transactions);
 
         $this->entityFactoryMock->expects($this->exactly(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT))
             ->method('create')
@@ -157,15 +157,15 @@ public function testGetItemsWithLimit()
      */
     public function testGetItemsWithNullLimit()
     {
-        $transations = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
+        $transactions = range(1, TransactionsCollection::TRANSACTION_MAXIMUM_COUNT + 10);
 
         $this->filterMapperMock->expects($this->once())
             ->method('getFilter')
             ->willReturn(new BraintreeSearchNodeStub());
 
         $this->braintreeAdapterMock->expects($this->once())
             ->method('search')
-            ->willReturn($transations);
+            ->willReturn($transactions);
 
         $this->entityFactoryMock->expects($this->exactly(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT))
             ->method('create')

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

@@ -1365,7 +1365,7 @@ public function testPrepareForCartAdvancedParentClassReturnString()
     /**
      * @return void
      */
-    public function testPrepareForCartAdvancedAllrequiredOption()
+    public function testPrepareForCartAdvancedAllRequiredOption()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|DefaultType $group */
         $group = $this->getMockBuilder(\Magento\Catalog\Model\Product\Option\Type\DefaultType::class)

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

@@ -12,7 +12,6 @@
 
 <?php $items = $block->getChildren($parentItem) ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>

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

@@ -12,7 +12,6 @@
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
 
 <?php $items = $block->getChildren($parentItem) ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>

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

@@ -10,7 +10,6 @@
 ?>
 <?php $parentItem = $block->getItem() ?>
 <?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>

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

@@ -12,7 +12,6 @@
 <?php $parentItem = $block->getItem() ?>
 <?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
 <?php $shipItems = $block->getChildren($parentItem) ?>
-<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>

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

@@ -72,8 +72,8 @@ public function execute($entityType, $entity)
         $linkedProduct = $this->productRepository->get($entity->getLinkedProductSku());
         $product = $this->productRepository->get($entity->getSku());
         $linkTypesToId = $this->linkTypeProvider->getLinkTypes();
-        $prodyctHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
-        $productData = $prodyctHydrator->extract($product);
+        $productHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
+        $productData = $productHydrator->extract($product);
         $linkId = $this->linkResource->getProductLinkId(
             $productData[$this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()],
             $linkedProduct->getId(),

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

@@ -97,8 +97,8 @@ public function execute($entityType, $entity)
 
         try {
             $linkTypesToId = $this->linkTypeProvider->getLinkTypes();
-            $prodyctHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
-            $productData = $prodyctHydrator->extract($product);
+            $productHydrator = $this->metadataPool->getHydrator(ProductInterface::class);
+            $productData = $productHydrator->extract($product);
             $this->linkResource->saveProductLinks(
                 $productData[$this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()],
                 $links,