Merge branch '2.3-develop' into MAGETWO-70174-data-migration

Author: Robert He

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php

@@ -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
      */

app/code/Magento/Backend/Test/Unit/Block/Cache/AdditionalTest.php

@@ -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
@@ -39,7 +39,7 @@ protected function setUp()
             ]
         );
 
-        $this->additonalBlock = $objectHelper->getObject(
+        $this->additionalBlock = $objectHelper->getObject(
             \Magento\Backend\Block\Cache\Additional::class,
             ['context' => $context]
         );
@@ -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()
@@ -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()
@@ -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());
     }
 
     /**
@@ -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()

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -318,12 +318,21 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
         return $populatedSelection;
     }
 
+    /**
+     * @deprecated Misspelled method
+     * @see retrieveProductsByCachedSkus
+     */
+    protected function retrieveProducsByCachedSkus()
+    {
+        return $this->retrieveProductsByCachedSkus();
+    }
+
     /**
      * Retrieve mapping between skus and products.
      *
      * @return \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
      */
-    protected function retrieveProducsByCachedSkus()
+    protected function retrieveProductsByCachedSkus()
     {
         $this->_cachedSkuToProducts = $this->connection->fetchPairs(
             $this->connection->select()->from(
@@ -368,7 +377,7 @@ public function saveData()
                     $this->parseSelections($rowData, $productData[$this->getProductEntityLinkField()]);
                 }
                 if (!empty($this->_cachedOptions)) {
-                    $this->retrieveProducsByCachedSkus();
+                    $this->retrieveProductsByCachedSkus();
                     $this->populateExistingOptions();
                     $this->insertOptions();
                     $this->insertSelections();

app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php

@@ -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

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

@@ -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);
         }
 

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php

@@ -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
      */

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php

@@ -104,7 +104,7 @@ protected function _construct()
     }
 
     /**
-     * Retirve currently edited product model
+     * Retrieve currently edited product model
      *
      * @return \Magento\Catalog\Model\Product
      */
@@ -315,7 +315,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * Rerieve grid URL
+     * Retrieve grid URL
      *
      * @return string
      */

app/code/Magento/Catalog/Block/Navigation.php

@@ -195,7 +195,7 @@ public function getCurrentChildCategories()
     }
 
     /**
-     * Checkin activity of category
+     * Check activity of category
      *
      * @param   \Magento\Framework\DataObject $category
      * @return  bool

app/code/Magento/Catalog/Block/Widget/RecentlyCompared.php

@@ -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

app/code/Magento/Catalog/Block/Widget/RecentlyViewed.php

@@ -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