magento
diff --git a/‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php‎
Lines changed: 3 additions & 3 deletions b/‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml‎
Lines changed: 2 additions & 2 deletions b/‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml‎
Lines changed: 4 additions & 4 deletions b/‎app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml‎
Lines changed: 4 additions & 4 deletions b/‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php‎
Lines changed: 2 additions & 2 deletions b/‎app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php‎
Lines changed: 2 additions & 2 deletions
@@ -394,7 +394,7 @@ protected function saveAndReplaceAdvancedPrices()
                             ? $rowData[self::COL_TIER_PRICE] : 0,
                         'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT
                             ? $rowData[self::COL_TIER_PRICE] : null,
-                        'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
+                        'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])
                     ];
                 }
             }
 
@@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class)
+        $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class)
             ->setMethods(['getBaseCurrency'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -37,7 +37,7 @@ protected function _prepareForm()
             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
         );
 
-        $this->_prepareStoreFieldSet($form);
+        $this->_prepareStoreFieldset($form);
 
         $form->addField(
             'store_type',
 
@@ -54,9 +54,9 @@ public function execute()
         $user = $this->_objectManager->create(\Magento\User\Model\User::class)->load($userId);
 
         $user->setId($userId)
-            ->setUsername($this->getRequest()->getParam('username', false))
-            ->setFirstname($this->getRequest()->getParam('firstname', false))
-            ->setLastname($this->getRequest()->getParam('lastname', false))
+            ->setUserName($this->getRequest()->getParam('username', false))
+            ->setFirstName($this->getRequest()->getParam('firstname', false))
+            ->setLastName($this->getRequest()->getParam('lastname', false))
             ->setEmail(strtolower($this->getRequest()->getParam('email', false)));
 
         if ($this->_objectManager->get(\Magento\Framework\Validator\Locale::class)->isValid($interfaceLocale)) {
 
@@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns()
 
     public function testGetRowUrlIfUrlPathNotSet()
     {
-        $this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));
+        $this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));
     }
 
     public function testGetRowUrl()
 
@@ -351,7 +351,7 @@ public function testSetGetGrid()
 
         $this->_block->setFilter('StdClass');
 
-        $grid = new \StdClass();
+        $grid = new \stdClass();
         $this->_block->setGrid($grid);
         $this->assertEquals($grid, $this->_block->getGrid());
     }
 
@@ -29,7 +29,7 @@
                 data-mage-init='{"dropdown":{}}'
                 data-toggle="dropdown">
                 <span class="admin__action-dropdown-text">
-                    <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>
+                    <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>
                 </span>
             </a>
             <ul class="admin__action-dropdown-menu">
@@ -39,7 +39,7 @@
                         href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
                         <?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
                         title="<?= $block->escapeHtml(__('Account Setting')) ?>">
-                        <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>)
+                        <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUserName()) ?></span>)
                     </a>
                 </li>
                 <?php endif; ?>
 
@@ -28,16 +28,16 @@
     <script data-template="search-suggest" type="text/x-magento-template">
         <ul class="search-global-menu">
         <li class="item">
-            <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getURL('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+            <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
         </li>
         <li class="item">
-            <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getURL('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+            <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
         </li>
         <li class="item">
-            <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getURL('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+            <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
         </li>
         <li class="item">
-            <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getURL('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+            <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getUrl('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
         </li>
             <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>
 
@@ -72,7 +72,7 @@ $numColumns = sizeof($block->getColumns());
             <?php if ($block->getPagerVisibility()): ?>
                 <div class="admin__data-grid-pager-wrap">
                     <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
-                            id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+                            id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
                             onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
                             class="admin__control-select">
                         <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
@@ -91,7 +91,7 @@ $numColumns = sizeof($block->getColumns());
                             selected="selected"<?php endif; ?>>200
                         </option>
                     </select>
-                    <label for="<?= $block->escapeHTML($block->getHtmlId()) ?><?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+                    <label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
                         class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
 
                     <div class="admin__data-grid-pager">
@@ -107,12 +107,12 @@ $numColumns = sizeof($block->getColumns());
                             <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
                         <?php endif; ?>
                         <input type="text"
-                               id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current"
+                               id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
                                name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
                                value="<?= /* @escapeNotVerified */ $_curPage ?>"
                                class="admin__control-text"
                                onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
-                        <label class="admin__control-support-text" for="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current">
+                        <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
                             <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                         </label>
                         <?php if ($_curPage < $_lastPage): ?>
 
@@ -44,9 +44,9 @@ public function getValuesHtml()
                 ]
             );
             if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
-                $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
+                $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
             } else {
-                $select->setName('options[' . $_option->getid() . '][]');
+                $select->setName('options[' . $_option->getId() . '][]');
                 $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
             }
             foreach ($_option->getValues() as $_value) {
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ protected function saveAndReplaceAdvancedPrices()`
`394`	`394`	`? $rowData[self::COL_TIER_PRICE] : 0,`
`395`	`395`	`'percentage_value' => $rowData[self::COL_TIER_PRICE_TYPE] === self::TIER_PRICE_TYPE_PERCENT`
`396`	`396`	`? $rowData[self::COL_TIER_PRICE] : null,`
`397`		`- 'website_id' => $this->getWebsiteId($rowData[self::COL_TIER_PRICE_WEBSITE])`
	`397`	`+ 'website_id' => $this->getWebSiteId($rowData[self::COL_TIER_PRICE_WEBSITE])`
`398`	`398`	`];`
`399`	`399`	`}`
`400`	`400`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class WebsiteTest extends \PHPUnit\Framework\TestCase`
`27`	`27`
`28`	`28`	`protected function setUp()`
`29`	`29`	`{`
`30`		`- $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\WebSite::class)`
	`30`	`+ $this->webSiteModel = $this->getMockBuilder(\Magento\Store\Model\Website::class)`
`31`	`31`	`->setMethods(['getBaseCurrency'])`
`32`	`32`	`->disableOriginalConstructor()`
`33`	`33`	`->getMock();`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function testSetFilterTypePropagatesFilterTypeToColumns()`
`117`	`117`
`118`	`118`	`public function testGetRowUrlIfUrlPathNotSet()`
`119`	`119`	`{`
`120`		`- $this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));`
	`120`	`+ $this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`public function testGetRowUrl()`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public function testSetGetGrid()`
`351`	`351`
`352`	`352`	`$this->_block->setFilter('StdClass');`
`353`	`353`
`354`		`- $grid = new \StdClass();`
	`354`	`+ $grid = new \stdClass();`
`355`	`355`	`$this->_block->setGrid($grid);`
`356`	`356`	`$this->assertEquals($grid, $this->_block->getGrid());`
`357`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ public function getValuesHtml()`
`44`	`44`	`]`
`45`	`45`	`);`
`46`	`46`	`if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {`
`47`		`- $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));`
	`47`	`+ $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));`
`48`	`48`	`} else {`
`49`		`- $select->setName('options[' . $_option->getid() . '][]');`
	`49`	`+ $select->setName('options[' . $_option->getId() . '][]');`
`50`	`50`	`$select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');`
`51`	`51`	`}`
`52`	`52`	`foreach ($_option->getValues() as $_value) {`