diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 23829d372511976679ecd5c9c2735b8f1ff25cc1..0e8acb37104e666e6f273e99ac2c173946f15cbc 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -394,7 +394,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
? $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])
];
}
}
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
index 5111b4932d7a8954197ef99b242ea25120902e22..9a380ff75da2468af835a38a458a3ee24101f5cf 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
@@ -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();
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
index f19799d2e4939a8298c951a92b906c5bd88f5671..034887c67d1ee31513ad879ed260166be10ab4db 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php
@@ -37,7 +37,7 @@ abstract class AbstractForm extends \Magento\Backend\Block\Widget\Form\Generic
['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
);
- $this->_prepareStoreFieldSet($form);
+ $this->_prepareStoreFieldset($form);
$form->addField(
'store_type',
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index c9bce1cbf388857216faafe5fdce8f4878f0407a..421885a0c32a37d88707d2943f100646bac8c7b3 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -54,9 +54,9 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
$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)) {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
index be171a8ed40bff13d0986588f0b0b26a99462547..df242a4cf612936cc24d18b1bebc284653c5c9bb 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
@@ -117,7 +117,7 @@ class ColumnSetTest extends \PHPUnit\Framework\TestCase
public function testGetRowUrlIfUrlPathNotSet()
{
- $this->assertEquals('#', $this->_block->getRowUrl(new \StdClass()));
+ $this->assertEquals('#', $this->_block->getRowUrl(new \stdClass()));
}
public function testGetRowUrl()
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
index da13af87b71ea0582997bf0c24e2eecf57220a8a..c5c56fd75fbe7c6d4b0bacf5ea833f3d55b795d9 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
@@ -351,7 +351,7 @@ class ColumnTest extends \PHPUnit\Framework\TestCase
$this->_block->setFilter('StdClass');
- $grid = new \StdClass();
+ $grid = new \stdClass();
$this->_block->setGrid($grid);
$this->assertEquals($grid, $this->_block->getGrid());
}
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 40b7173f47417cb96ef88c68867cb799ac26f0ab..8feccc9cf1b8fbb2e9a9d7e17c27a5a01145ce91 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -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; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
index a528133b2bc3a5ad6d2ca730f2022696f2d57c73..b50183ced29b456911b3d73d21ab8ed8ef2e5430 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
@@ -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){ %>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index a31bf4d23abaa10b70b3b629522c1e184ad1e5e0..f97db4ad993b126fbfe1ec7a3e9567b358fb0dc2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -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): ?>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 15808c9dd170d7a25f88378cf1dda26e2c0507ab..0e21e566d5e752a6391033a349df71f9b4cd50c4 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -142,7 +142,6 @@ class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Ele
[
'name' => "product[{$switchAttributeCode}]",
'values' => $this->getOptions(),
- 'value' => $switchAttributeCode,
'class' => 'required-entry next-toinput',
'no_span' => true,
'disabled' => $this->isDisabledField(),
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index d546ef483132b7243cb7ca9aba26d0b8df0ff366..7df9b972e15018a166c6b956df389c2e66f285a4 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -44,9 +44,9 @@ class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
]
);
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) {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
index 5963d8b1616332de48598a3c8ae1f099cb46e4b8..3003c2f8085e4a050107b441b1db1c74ef0d006c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -47,7 +47,7 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
'scopeOverriddenValue' => $scopeOverriddenValue
]
);
- $resource = $this->createPartialMock(\StdClass::class, ['getMainTable']);
+ $resource = $this->createPartialMock(\stdClass::class, ['getMainTable']);
$resource->expects($this->any())->method('getMainTable')->will($this->returnValue('table'));
$this->_model->expects($this->any())->method('_getResource')->will($this->returnValue($resource));
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 15c33c56e3ac655d9be53e34fc7137c03f0f7ebe..2c62bbf8db3e950167f2ccc7cc1caf0da90033b0 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -27,7 +27,7 @@
<option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
</select>
<input type="hidden" id="inventory_manage_stock_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('manage_stock') ?>">
- <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_manage_stock"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
<?php if (!$block->isReadonly()): ?>
@@ -67,7 +67,7 @@ toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_con
<input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
<div class="control-inner-wrap">
- <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_min_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
</div>
@@ -94,7 +94,7 @@ toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_m
name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
<div class="control-inner-wrap">
- <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_min_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
</div>
@@ -117,7 +117,7 @@ toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_con
</label>
<div class="control">
<input type="text" class="input-text validate-number" id="inventory_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
- <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
<div class="control-inner-wrap">
<input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_max_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
@@ -182,7 +182,7 @@ toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_con
</select>
<div class="control-inner-wrap">
- <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_backorders"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
</div>
@@ -207,7 +207,7 @@ toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_confi
<input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
<div class="control-inner-wrap">
- <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_notify_stock_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
</div>
@@ -238,7 +238,7 @@ toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use
<input type="hidden" id="inventory_enable_qty_increments_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('enable_qty_increments') ?>">
<div class="control-inner-wrap">
- <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_enable_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
</div>
@@ -262,7 +262,7 @@ toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventor
<div class="control">
<input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
<div class="control-inner-wrap">
- <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->IsNew()) ? 'checked="checked"' : '' ?>
+ <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
<input type="checkbox" id="inventory_use_config_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
<label for="inventory_use_config_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
</div>
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index a557e045c5ef20d48c091c4879e970093dd38835..d8a43d92f6d44e9fc92b0895a1a59886af3e3e54 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -148,7 +148,7 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isUsingStaticUrlsAllowed()
{
- $checkResult = new \StdClass();
+ $checkResult = new \stdClass();
$checkResult->isAllowed = false;
$this->_eventManager->dispatch(
'cms_wysiwyg_images_static_urls_allowed',
diff --git a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
index 05dad459f064e16d88729ba2f84cbbf90e447c15..67401797502ce144a4674b7ac4122d580f93f07e 100644
--- a/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php
@@ -293,7 +293,7 @@ class ImagesTest extends \PHPUnit\Framework\TestCase
{
$storeId = 1;
$this->imagesHelper->setStoreId($storeId);
- $checkResult = new \StdClass();
+ $checkResult = new \stdClass();
$checkResult->isAllowed = false;
$this->eventManagerMock->expects($this->any())
->method('dispatch')
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
index a3bdb6f008f1d9f33e70ec7a1c2aea7b186c8783..b779c29c9315565c2cc638b9c106380c2aa08889 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
@@ -44,7 +44,7 @@ class ElementVisibilityCompositeTest extends \PHPUnit\Framework\TestCase
public function testException()
{
$visibility = [
- 'stdClass' => new \StdClass()
+ 'stdClass' => new \stdClass()
];
new ElementVisibilityComposite($visibility);
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
index 519288a50c8582245f5f5fc7aa17ddcc4a415e7f..5b4a8d5b8a9756421581d15383d24818c72562ba 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php
@@ -39,7 +39,7 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
public function testGetTagsWithObject()
{
$this->expectException(\InvalidArgumentException::class, 'Provided argument must be a product');
- $this->model->getTags(new \StdClass());
+ $this->model->getTags(new \stdClass());
}
public function testGetTagsWithVariation()
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
index 8506defbf900507c315775a4abb3250629595f8a..032d1ae5d732ff0d72cdbe17d756b0f77049010e 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -160,7 +160,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
]
);
- if ($this->customerAccountManagement->isReadOnly($customerId)) {
+ if ($this->customerAccountManagement->isReadonly($customerId)) {
$form->getElement('subscription')->setReadonly(true, true);
}
$isSubscribed = $subscriber->isSubscribed();
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php
index c9e101ed3a9e82503275c36aa5aaf5268a53ce55..8a0284eb4f7757318bb0d12e67fc0ee09939332e 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ImporterFactoryTest.php
@@ -55,7 +55,7 @@ class ImporterFactoryTest extends \PHPUnit\Framework\TestCase
$className = 'some/class/name';
/** @var \StdClass|\PHPUnit_Framework_MockObject_MockObject $importerMock */
- $importerMock = $this->getMockBuilder(\StdClass::class)
+ $importerMock = $this->getMockBuilder(\stdClass::class)
->disableOriginalConstructor()
->getMock();
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php
index 1da524b37ca153cb4dc13a7b4d0165b4559a6018..50960808781ab6baeb29cbf665dfb191d9838d6e 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ValidatorFactoryTest.php
@@ -56,7 +56,7 @@ class ValidatorFactoryTest extends \PHPUnit\Framework\TestCase
{
$className = 'className';
- $stdMock = $this->getMockBuilder(\StdClass::class)
+ $stdMock = $this->getMockBuilder(\stdClass::class)
->disableOriginalConstructor()
->getMock();
$this->objectManagerMock->expects($this->once())
diff --git a/app/code/Magento/Downloadable/Helper/File.php b/app/code/Magento/Downloadable/Helper/File.php
index 6c248404d19112f04168a8c4c1a20807f45867ac..10ee9ff405ec8ca0e8ead90458f805edf6e073c9 100644
--- a/app/code/Magento/Downloadable/Helper/File.php
+++ b/app/code/Magento/Downloadable/Helper/File.php
@@ -766,7 +766,6 @@ class File extends \Magento\Framework\App\Helper\AbstractHelper
'xxyz' => 'chemical/x-xyz',
'xzaz' => 'application/vnd.zzazz.deck+xml',
'xzip' => 'application/zip',
- 'xzmm' => 'application/vnd.handheld-entertainment+xml',
- 'xodt' => 'application/x-vnd.oasis.opendocument.spreadsheet',
+ 'xzmm' => 'application/vnd.handheld-entertainment+xml'
];
}
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
index 65239ad353c3f46db79712b75dadc48ef0f61ec9..b84a8284c908368cff8ee23b4248983f2905489c 100644
--- a/app/code/Magento/Downloadable/Model/LinkRepository.php
+++ b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -207,7 +207,7 @@ class LinkRepository implements \Magento\Downloadable\Api\LinkRepositoryInterfac
$isGlobalScopeContent
) {
$linkData = [
- 'link_id' => (int)$link->getid(),
+ 'link_id' => (int)$link->getId(),
'is_delete' => 0,
'type' => $link->getLinkType(),
'sort_order' => $link->getSortOrder(),
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index 633243ac2eb86f9269ac24da3358949f51960d6e..5b9e8e784b9f331bbab85feae205ad43ea918bed 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -215,7 +215,7 @@ class SampleRepository implements \Magento\Downloadable\Api\SampleRepositoryInte
$isGlobalScopeContent
) {
$sampleData = [
- 'sample_id' => (int)$sample->getid(),
+ 'sample_id' => (int)$sample->getId(),
'is_delete' => 0,
'type' => $sample->getSampleType(),
'sort_order' => $sample->getSortOrder(),
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
index 155f95874eeeb1b83c5e2cc6ac1edc1d781cebb7..5b04c83f4ffb7a45977ccac4e6e184d1e9fb69ca 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
@@ -156,7 +156,7 @@ class CompositeTest extends \PHPUnit\Framework\TestCase
*/
protected function initModifiers()
{
- $this->modifierMock = $this->getMockBuilder(\StdClass::class)
+ $this->modifierMock = $this->getMockBuilder(\stdClass::class)
->setMethods(['modifyData', 'modifyMeta'])
->getMock();
$this->modifierFactoryMock->expects($this->once())
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 105bc0a0becf5bcf0df3223ffeb703af0134751c..0c74b84457d408b5a9920334e3724563c73ba187 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1656,7 +1656,7 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
$this->_processAttributeValues();
$connection->commit();
} catch (\Exception $e) {
- $connection->rollback();
+ $connection->rollBack();
throw $e;
}
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
index aa531e8189cea0bc27d30b80d178aa67ca525216..9a333e2d01a88f3391fdbc7ea834cbcda24c3b27 100644
--- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/EditTest.php
@@ -66,7 +66,7 @@ class EditTest extends \PHPUnit\Framework\TestCase
['getFilesystem', '__wakeup', 'getPath', 'getDirectoryRead']
);
- $viewFilesystem = $this->getMockBuilder(\Magento\Framework\View\Filesystem::class)
+ $viewFilesystem = $this->getMockBuilder(\Magento\Framework\View\FileSystem::class)
->setMethods(['getTemplateFileName'])
->disableOriginalConstructor()
->getMock();
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
index 615c80633cb0f46a8904ded7a206dd2b6dfae414..9dfd0e1e3319a5705f41ce5adec7e28c9ff20fdf 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdmins.php
@@ -66,8 +66,8 @@ class ReportConcurrentAdmins implements ObserverInterface
$user = $this->backendAuthSession->getUser();
$jsonData = [
'id' => $user->getId(),
- 'username' => $user->getUsername(),
- 'name' => $user->getFirstname() . ' ' . $user->getLastname(),
+ 'username' => $user->getUserName(),
+ 'name' => $user->getFirstName() . ' ' . $user->getLastName(),
];
$modelData = [
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
index cff1b159d481d4bc096070b33f066d493149716c..2f142f6ac81249e8a9a823ff14389d4059ea7e29 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportConcurrentAdminsToNewRelic.php
@@ -58,10 +58,10 @@ class ReportConcurrentAdminsToNewRelic implements ObserverInterface
if ($this->backendAuthSession->isLoggedIn()) {
$user = $this->backendAuthSession->getUser();
$this->newRelicWrapper->addCustomParameter(Config::ADMIN_USER_ID, $user->getId());
- $this->newRelicWrapper->addCustomParameter(Config::ADMIN_USER, $user->getUsername());
+ $this->newRelicWrapper->addCustomParameter(Config::ADMIN_USER, $user->getUserName());
$this->newRelicWrapper->addCustomParameter(
Config::ADMIN_NAME,
- $user->getFirstname() . ' ' . $user->getLastname()
+ $user->getFirstName() . ' ' . $user->getLastName()
);
}
}
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
index 0e3ad1605f9480c37b430934022653b8f3676b0a..5500aba195936ee9b2b2c485135b84e7fdf6e816 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportSystemCacheFlushToNewRelic.php
@@ -58,8 +58,8 @@ class ReportSystemCacheFlushToNewRelic implements ObserverInterface
if ($user->getId()) {
$this->deploymentsFactory->create()->setDeployment(
'Cache Flush',
- $user->getUsername() . ' flushed the cache.',
- $user->getUsername()
+ $user->getUserName() . ' flushed the cache.',
+ $user->getUserName()
);
}
}
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
index 500ab253f2a188f3eb0900bfdad82cf85cf6c8a5..961958a54ac1b385a34cb76cec880daed2735dba 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
@@ -232,10 +232,10 @@ class Tablerate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
$this->_importedRows += count($values);
}
} catch (\Magento\Framework\Exception\LocalizedException $e) {
- $connection->rollback();
+ $connection->rollBack();
throw new \Magento\Framework\Exception\LocalizedException(__('Unable to import data'), $e);
} catch (\Exception $e) {
- $connection->rollback();
+ $connection->rollBack();
$this->logger->critical($e);
throw new \Magento\Framework\Exception\LocalizedException(
__('Something went wrong while importing table rates.')
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php
index cc164e504b665a54620f9a38ba5042bb2e2c1eac..3e2c7df9087da11e26cd985e56fed545dafb97c8 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ExportTest.php
@@ -37,7 +37,7 @@ class ExportTest extends \PHPUnit\Framework\TestCase
$requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
$requestMock->expects($this->once())->method('getParam')->with('website')->will($this->returnValue(1));
- $mockData = $this->createPartialMock(\StdClass::class, ['toHtml']);
+ $mockData = $this->createPartialMock(\stdClass::class, ['toHtml']);
$mockData->expects($this->once())->method('toHtml')->will($this->returnValue($expected));
$blockMock->expects($this->once())->method('getRequest')->will($this->returnValue($requestMock));
diff --git a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
index 0796c22db98bfde36cdb270d614bf3707f772140..d4019c6c4a7e0f794f9ff72518dfa0f7d19c03b7 100644
--- a/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
+++ b/app/code/Magento/Paypal/Model/ResourceModel/Report/Settlement.php
@@ -90,7 +90,7 @@ class Settlement extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
}
$connection->commit();
} catch (\Exception $e) {
- $connection->rollback();
+ $connection->rollBack();
}
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
index f5c9ab9a3d9f1dbd60542d1649e27a6088e3aa1a..93a10727824485e88e25b19d092bbcee71ccb595 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
@@ -67,7 +67,7 @@ class TransactionTest extends \PHPUnit\Framework\TestCase
{
return [
"Input data is a string" => ['testInput'],
- "Input data is an object" => [new \StdClass],
+ "Input data is an object" => [new \stdClass],
"Input data is an array" => [['test' => 'input']]
];
}
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php b/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
index 6f68000a1efffa4cd723a075897b7813434e97be..ef4acb6c90cb861bed70fb8cf17f6846d3bebcb6 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating/Option.php
@@ -154,7 +154,7 @@ class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
}
$connection->commit();
} catch (\Exception $e) {
- $connection->rollback();
+ $connection->rollBack();
throw new \Exception($e->getMessage());
}
return $this;
diff --git a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
index 2fdb960521a97b8d14d98acd7d8c70c9ae3b5e5f..6e685a9a9b978264a20c6d259972e67022ef2657 100644
--- a/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Rule/Model/ResourceModel/AbstractResource.php
@@ -81,7 +81,7 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
try {
$this->_multiplyBunchInsert($ruleIds, $entityIds, $entityType);
} catch (\Exception $e) {
- $this->getConnection()->rollback();
+ $this->getConnection()->rollBack();
throw $e;
}
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php
index 20f7a7061b6b0be800e4e31c6c8435866ee6bc79..a390c4327608575210a9153c7f9a8408fa382dce 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractItemsTest.php
@@ -84,7 +84,7 @@ class AbstractItemsTest extends \PHPUnit\Framework\TestCase
*/
public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
{
- $renderer = $this->createMock(\StdClass::class);
+ $renderer = $this->createMock(\stdClass::class);
$layout = $this->createPartialMock(
\Magento\Framework\View\Layout::class,
['getChildName', 'getBlock', '__wakeup']
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php
index 311e5f697675b1f4688dd2ef92cabe3bd3007eea..a34373f516c42a1e8cde771ef85b7ebb9ea002a7 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Items/AbstractTest.php
@@ -62,7 +62,7 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
*/
public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
{
- $renderer = $this->createMock(\StdClass::class);
+ $renderer = $this->createMock(\stdClass::class);
$layout = $this->createPartialMock(
\Magento\Framework\View\Layout::class,
['getChildName', 'getBlock', '__wakeup']
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
index 70e5ad127e44c596f5096ce12b1537008e4e0669..293c2eea1231d30e51984eef5cec815f014185a7 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
@@ -179,7 +179,7 @@ class InfoTest extends \PHPUnit\Framework\TestCase
*/
public function testSetAdditionalInformationException()
{
- $this->info->setAdditionalInformation('object', new \StdClass());
+ $this->info->setAdditionalInformation('object', new \stdClass());
}
/**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php
index c91d4edb155a404a19b075424d453020734b63a0..0761b5abb5d45d8d56df7bf6f3136b2de4343d03 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php
@@ -19,7 +19,7 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
// Setup parameters, that will be passed to the tested model method
$page = $this->createMock(\Zend_Pdf_Page::class);
- $order = new \StdClass();
+ $order = new \stdClass();
$source = $this->createMock(\Magento\Sales\Model\Order\Invoice::class);
$source->expects($this->any())->method('getOrder')->will($this->returnValue($order));
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php
index b1b51c3f12330a8412ea3ab55cb985bfa154465a..b808a4139e84e09cb65616047e5ae5fd5f44fb41 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/ReaderTest.php
@@ -87,7 +87,7 @@ class ReaderTest extends \PHPUnit\Framework\TestCase
public function testRead()
{
$expectedResult = new \stdClass();
- $constraint = function (\DOMDOcument $actual) {
+ $constraint = function (\DOMDocument $actual) {
try {
$expected = __DIR__ . '/_files/pdf_merged.xml';
\PHPUnit\Framework\Assert::assertXmlStringEqualsXmlFile($expected, $actual->saveXML());
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
index abb8c490159623f119133cd543e25370df1c2c0b..89800e3be872e51a9b1f9a01889ddaf33b45ddf1 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
@@ -9,7 +9,7 @@
namespace Magento\Tax\Test\Unit\Model\Calculation;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Tax\Model\Calculation\RowbaseCalculator;
+use Magento\Tax\Model\Calculation\RowBaseCalculator;
use Magento\Tax\Model\Calculation\TotalBaseCalculator;
/**
diff --git a/app/code/Magento/Ui/Config/Converter/HtmlContent.php b/app/code/Magento/Ui/Config/Converter/HtmlContent.php
index f77b4a5285d5ade3a5411927c4dec69adf5a9544..db874a302bd50dbe21bb55a01ee0e586cff83426 100644
--- a/app/code/Magento/Ui/Config/Converter/HtmlContent.php
+++ b/app/code/Magento/Ui/Config/Converter/HtmlContent.php
@@ -23,7 +23,7 @@ class HtmlContent implements ConverterInterface
if ($node->nodeType == XML_ELEMENT_NODE) {
$xml = '<?xml version="1.0"?>' . "\n"
. '<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . "\n"
- . $node->ownerDocument->saveXml($node) . "\n"
+ . $node->ownerDocument->saveXML($node) . "\n"
. '</layout>';
$items['layout']['xsi:type'] = 'string';
$items['layout']['name'] = 'layout';
diff --git a/app/code/Magento/User/Model/ResourceModel/User.php b/app/code/Magento/User/Model/ResourceModel/User.php
index 880dec93fc91bb46a0a6570c0ec5685d47fec345..b3e4936266a3f6d558741dfa31ef729dc2cbe83d 100644
--- a/app/code/Magento/User/Model/ResourceModel/User.php
+++ b/app/code/Magento/User/Model/ResourceModel/User.php
@@ -222,7 +222,7 @@ class User extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
'role_type' => RoleUser::ROLE_TYPE,
'user_id' => $user->getId(),
'user_type' => UserContextInterface::USER_TYPE_ADMIN,
- 'role_name' => $user->getFirstname(),
+ 'role_name' => $user->getFirstName(),
]
);
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index b1b655dddd0a3068de782ed67cfbd9cb351ea039..2a7d43008f2ad6ad81878a8052ef94d9e5c29b8d 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -467,7 +467,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
$changes[] = __('password');
}
- if ($this->getUsername() != $this->getOrigData('username') && $this->getOrigData('username')) {
+ if ($this->getUserName() != $this->getOrigData('username') && $this->getOrigData('username')) {
$changes[] = __('username');
}
@@ -515,7 +515,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
*/
public function getName($separator = ' ')
{
- return $this->getFirstname() . $separator . $this->getLastname();
+ return $this->getFirstName() . $separator . $this->getLastName();
}
/**
@@ -547,7 +547,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
['username' => $username, 'user' => $this]
);
$this->loadByUsername($username);
- $sensitive = $config ? $username == $this->getUsername() : true;
+ $sensitive = $config ? $username == $this->getUserName() : true;
if ($sensitive && $this->getId()) {
$result = $this->verifyIdentity($password);
}
diff --git a/app/code/Magento/User/Test/Unit/Model/UserTest.php b/app/code/Magento/User/Test/Unit/Model/UserTest.php
index 3f02cedd32e6536051e5a7e7ca985f497821ef85..5e0a9a14c2b16f9a52376f515687614032226eea 100644
--- a/app/code/Magento/User/Test/Unit/Model/UserTest.php
+++ b/app/code/Magento/User/Test/Unit/Model/UserTest.php
@@ -183,11 +183,11 @@ class UserTest extends \PHPUnit\Framework\TestCase
$this->model->setPassword($password);
$this->model->setOrigData('password', $origPassword);
- $this->model->setUsername($username);
+ $this->model->setUserName($username);
$this->model->setOrigData('username', $origUsername);
- $this->model->setFirstname($firstName);
- $this->model->setLastname($lastName);
+ $this->model->setFirstName($firstName);
+ $this->model->setLastName($lastName);
$this->configMock->expects($this->exactly(4))
->method('getValue')
@@ -255,8 +255,8 @@ class UserTest extends \PHPUnit\Framework\TestCase
$lastName = 'Bar';
$this->model->setEmail($email);
- $this->model->setFirstname($firstName);
- $this->model->setLastname($lastName);
+ $this->model->setFirstName($firstName);
+ $this->model->setLastName($lastName);
$this->configMock->expects($this->at(0))
->method('getValue')
diff --git a/app/code/Magento/Webapi/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php
index ee9c194e7c55ae3da7cf95385f4e7d9ba6944c1c..b8ddf4e47d451b4f8a61946232b30c847a6d83ab 100644
--- a/app/code/Magento/Webapi/Model/Soap/Fault.php
+++ b/app/code/Magento/Webapi/Model/Soap/Fault.php
@@ -355,7 +355,7 @@ FAULT_MESSAGE;
$errorsXml = '';
foreach ($wrappedErrors as $error) {
- $errorsXml .= $this->_generateErrorNodeXml($error);
+ $errorsXml .= $this->_generateErrorNodeXML($error);
}
if (!empty($errorsXml)) {
$wrappedErrorsNode = self::NODE_DETAIL_WRAPPED_ERRORS;
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php b/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
index 65e45b73d88ebfdca49278696b0866bbf90d868b..301869a50a7131308859f206e54554b6427b13e9 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
@@ -41,7 +41,7 @@ class FileResolverTest extends \PHPUnit\Framework\TestCase
public function testGetGlobal()
{
- $expected = new \StdClass();
+ $expected = new \stdClass();
$this->moduleReader
->expects($this->once())
->method('getConfigurationFiles')
@@ -52,7 +52,7 @@ class FileResolverTest extends \PHPUnit\Framework\TestCase
public function testGetDesign()
{
- $expected = new \StdClass();
+ $expected = new \stdClass();
$this->componentDirSearch->expects($this->once())
->method('collectFiles')
->with(ComponentRegistrar::THEME, 'etc/file')
@@ -63,7 +63,7 @@ class FileResolverTest extends \PHPUnit\Framework\TestCase
public function testGetDefault()
{
- $expected = new \StdClass();
+ $expected = new \stdClass();
$this->factory->expects($this->once())->method('create')->with([])->willReturn($expected);
$this->assertSame($expected, $this->object->get('file', 'unknown'));
}
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
index d7a92460a7f4d7efd44cae073daf6cfdcd23d912..dab0650fc7f6eaa80832f5a053f218c965448772 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
@@ -97,7 +97,7 @@ class ExtensionAttributesFactory
}
$modelReflection = new \ReflectionClass($extensibleClassName);
if ($modelReflection->isInterface()
- && $modelReflection->isSubClassOf(self::EXTENSIBLE_INTERFACE_NAME)
+ && $modelReflection->isSubclassOf(self::EXTENSIBLE_INTERFACE_NAME)
&& $modelReflection->hasMethod('getExtensionAttributes')
) {
$this->classInterfaceMap[$extensibleClassName] = $extensibleClassName;
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
index b419b3827e5ff346b669534c1ca6dd8f78e8611a..ef7b654b66a1d71d453d96cbd7343ff10214b120 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/PhpFormatter.php
@@ -11,6 +11,11 @@ namespace Magento\Framework\App\DeploymentConfig\Writer;
*/
class PhpFormatter implements FormatterInterface
{
+ /**
+ * 2 space indentation for array formatting
+ */
+ const INDENT = ' ';
+
/**
* Format deployment configuration.
* If $comments is present, each item will be added
@@ -21,9 +26,9 @@ class PhpFormatter implements FormatterInterface
public function format($data, array $comments = [])
{
if (!empty($comments) && is_array($data)) {
- return "<?php\nreturn array (\n" . $this->formatData($data, $comments) . "\n);\n";
+ return "<?php\nreturn [\n" . $this->formatData($data, $comments) . "\n];\n";
}
- return "<?php\nreturn " . var_export($data, true) . ";\n";
+ return "<?php\nreturn " . $this->varExportShort($data, true) . ";\n";
}
/**
@@ -51,13 +56,13 @@ class PhpFormatter implements FormatterInterface
$elements[] = $prefix . " */";
}
- $elements[] = $prefix . var_export($key, true) . ' => ' .
- (!is_array($value) ? var_export($value, true) . ',' : '');
+ $elements[] = $prefix . $this->varExportShort($key) . ' => ' .
+ (!is_array($value) ? $this->varExportShort($value) . ',' : '');
if (is_array($value)) {
- $elements[] = $prefix . 'array (';
+ $elements[] = $prefix . '[';
$elements[] = $this->formatData($value, [], ' ' . $prefix);
- $elements[] = $prefix . '),';
+ $elements[] = $prefix . '],';
}
}
return implode("\n", $elements);
@@ -65,4 +70,29 @@ class PhpFormatter implements FormatterInterface
return var_export($data, true);
}
+
+ /**
+ * If variable to export is an array, format with the php >= 5.4 short array syntax. Otherwise use
+ * default var_export functionality.
+ *
+ * @param mixed $var
+ * @param int $depth
+ * @return string
+ */
+ private function varExportShort($var, int $depth = 0): string
+ {
+ if (!is_array($var)) {
+ return var_export($var, true);
+ }
+
+ $indexed = array_keys($var) === range(0, count($var) - 1);
+ $expanded = [];
+ foreach ($var as $key => $value) {
+ $expanded[] = str_repeat(self::INDENT, $depth)
+ . ($indexed ? '' : $this->varExportShort($key) . ' => ')
+ . $this->varExportShort($value, $depth + 1);
+ }
+
+ return sprintf("[\n%s\n%s]", implode(",\n", $expanded), str_repeat(self::INDENT, $depth - 1));
+ }
}
diff --git a/lib/internal/Magento/Framework/App/State/CleanupFiles.php b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
index 4202fd8883ec08ee9b345bf5fa036de134c155c0..c95caf8310b7700d864c8917bb979d258eaad745 100644
--- a/lib/internal/Magento/Framework/App/State/CleanupFiles.php
+++ b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
@@ -106,7 +106,7 @@ class CleanupFiles
$messages[] = $dirPath . $path;
try {
$dir->delete($path);
- } catch (FilesystemException $e) {
+ } catch (FileSystemException $e) {
$messages[] = $e->getMessage();
}
}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
index 4348177ef326fbcf39acdf58f005020d02005185..f4560ed31ae49b274b499d90416f04b727675299 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
@@ -47,7 +47,7 @@ class ResolverTest extends \PHPUnit\Framework\TestCase
public function testGetTagsForObject()
{
$strategyReturnValue = ['test tag'];
- $object = new \StdClass;
+ $object = new \stdClass;
$this->strategy->expects($this->once())
->method('getTags')
->with($object)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
index e8c76048f4eac1a422bad682c26499289faf2872..ad043260645875033aaf905c6e15a20de5546f0f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
@@ -28,7 +28,7 @@ class DummyTest extends \PHPUnit\Framework\TestCase
{
$emptyArray = [];
- $this->assertEquals($emptyArray, $this->model->getTags(new \StdClass));
+ $this->assertEquals($emptyArray, $this->model->getTags(new \stdClass));
$identityInterface = $this->getMockForAbstractClass(\Magento\Framework\DataObject\IdentityInterface::class);
$this->assertEquals($emptyArray, $this->model->getTags($identityInterface));
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
index 7f570d9f1352311960c21b1bf527a6f2f6e7182a..8964bd70f0ba8aba952e7c447fe9c31c2868e2fc 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
@@ -55,7 +55,7 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
public function testGetStrategyWithObject()
{
- $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \StdClass));
+ $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \stdClass));
}
public function testGetStrategyWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
index e2039c0517c53058647ddf247ce2343cefd4be9d..d0fcf9d8a739deccc515ed9bbb659e198417138c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
@@ -28,7 +28,7 @@ class IdentifierTest extends \PHPUnit\Framework\TestCase
public function testGetTagsWithObject()
{
- $this->assertEquals([], $this->model->getTags(new \StdClass));
+ $this->assertEquals([], $this->model->getTags(new \stdClass));
}
public function testGetTagsWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
index a1fdedc701e8c68c1732ecc8c10a8d9fe6b5b765..cc673e084c3b24b1c815bbff945e846a5a29b743 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/Writer/PhpFormatterTest.php
@@ -55,68 +55,68 @@ class PhpFormatterTest extends \PHPUnit\Framework\TestCase
];
$expectedResult1 = <<<TEXT
<?php
-return array (
+return [
'ns1' =>
- array (
+ [
's1' =>
- array (
+ [
0 => 's11',
1 => 's12',
- ),
+ ],
's2' =>
- array (
+ [
0 => 's21',
1 => 's22',
- ),
- ),
+ ],
+ ],
/**
* For the section: ns2
* comment for namespace 2
*/
'ns2' =>
- array (
+ [
's1' =>
- array (
+ [
0 => 's11',
- ),
- ),
+ ],
+ ],
'ns3' => 'just text',
'ns4' => 'just text',
-);
+];
TEXT;
$expectedResult2 = <<<TEXT
<?php
-return array (
+return [
/**
* For the section: ns1
* comment for' namespace 1
*/
'ns1' =>
- array (
+ [
's1' =>
- array (
+ [
0 => 's11',
1 => 's12',
- ),
+ ],
's2' =>
- array (
+ [
0 => 's21',
1 => 's22',
- ),
- ),
+ ],
+ ],
/**
* For the section: ns2
* comment for namespace 2.
* Next comment for' namespace 2
*/
'ns2' =>
- array (
+ [
's1' =>
- array (
+ [
0 => 's11',
- ),
- ),
+ ],
+ ],
/**
* For the section: ns3
* comment for" namespace 3
@@ -127,15 +127,39 @@ return array (
* comment for namespace 4
*/
'ns4' => 'just text',
-);
+];
+
+TEXT;
+
+ $expectedResult3 = <<<TEXT
+<?php
+return [
+ 'ns1' => [
+ 's1' => [
+ 's11',
+ 's12'
+ ],
+ 's2' => [
+ 's21',
+ 's22'
+ ]
+ ],
+ 'ns2' => [
+ 's1' => [
+ 's11'
+ ]
+ ],
+ 'ns3' => 'just text',
+ 'ns4' => 'just text'
+];
TEXT;
return [
['string', [], "<?php\nreturn 'string';\n"],
['string', ['comment'], "<?php\nreturn 'string';\n"],
- [$array, [], "<?php\nreturn " . var_export($array, true) . ";\n"],
[$array, $comments1, $expectedResult1],
[$array, $comments2, $expectedResult2],
+ [$array, [], $expectedResult3],
];
}
}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
index 450e1ed0b3a0062465fdb60ff66187b87845fe62..66eee671e17d3573b87feaec0349bfee68c59bf2 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -363,7 +363,7 @@ class HttpTest extends \PHPUnit\Framework\TestCase
{
$this->_model = $this->getModel();
$_SERVER['REQUEST_METHOD'] = $httpMethod;
- $this->assertEquals(true, $this->_model->IsSafeMethod());
+ $this->assertEquals(true, $this->_model->isSafeMethod());
}
/**
@@ -375,7 +375,7 @@ class HttpTest extends \PHPUnit\Framework\TestCase
{
$this->_model = $this->getModel();
$_SERVER['REQUEST_METHOD'] = $httpMethod;
- $this->assertEquals(false, $this->_model->IsSafeMethod());
+ $this->assertEquals(false, $this->_model->isSafeMethod());
}
public function httpSafeMethodProvider()
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
index 4508bccf54cdcb19c6a057c1237f95f80f732dbc..7fc2b13442bc21aee0a3c8b55db711aa921fb631 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php
@@ -132,7 +132,7 @@ class FirstClassForParentCall
$this->_arrayVariable = $arrayVariable;
}
}
-class ThirdClassForParentCall extends firstClassForParentCall
+class ThirdClassForParentCall extends FirstClassForParentCall
{
/**
* @var stdClass
@@ -155,7 +155,7 @@ class ThirdClassForParentCall extends firstClassForParentCall
$this->_secondClass = $secondClass;
}
}
-class WrongArgumentsOrder extends firstClassForParentCall
+class WrongArgumentsOrder extends FirstClassForParentCall
{
/**
* @var stdClass
@@ -178,7 +178,7 @@ class WrongArgumentsOrder extends firstClassForParentCall
$this->_secondClass = $secondClass;
}
}
-class ArgumentsOnSeparateLines extends firstClassForParentCall
+class ArgumentsOnSeparateLines extends FirstClassForParentCall
{
/**
* @var stdClass
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
index 58e6378759010066f60eca7e73587f3741e87e84..e91ec72dae112c4160440770d3ee92ec2ef94196 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
@@ -40,7 +40,7 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
$this->assertSame($this->collection->offsetExists('node1'), true);
$this->collection->offsetSet('node1', 'Hello');
$this->assertSame($this->collection->offsetExists('node1'), true);
- $this->assertSame($this->collection->offsetget('node1'), 'Hello');
+ $this->assertSame($this->collection->offsetGet('node1'), 'Hello');
$this->collection->offsetUnset('node1');
$this->assertSame($this->collection->offsetExists('node1'), false);
}
diff --git a/lib/internal/Magento/Framework/Xml/Security.php b/lib/internal/Magento/Framework/Xml/Security.php
index 72af506a3294ec90c27b963b5b98ed7203c7cc36..e502429e4511adc9c5f85f0e277cc40299f9a85d 100644
--- a/lib/internal/Magento/Framework/Xml/Security.php
+++ b/lib/internal/Magento/Framework/Xml/Security.php
@@ -72,7 +72,7 @@ class Security
E_WARNING
);
- $result = (bool)$document->loadXml($xmlContent, LIBXML_NONET);
+ $result = (bool)$document->loadXML($xmlContent, LIBXML_NONET);
restore_error_handler();
// Entity load to previous setting
libxml_disable_entity_loader($loadEntities);