diff --git a/.php_cs.dist b/.php_cs.dist index 0f254c63283bd..6c56ffb94b969 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -8,29 +8,16 @@ * Pre-commit hook installation: * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit */ -$finder = PhpCsFixer\Finder::create() - ->name('*.phtml') - ->exclude('dev/tests/functional/generated') - ->exclude('dev/tests/functional/var') - ->exclude('dev/tests/functional/vendor') - ->exclude('dev/tests/integration/tmp') - ->exclude('dev/tests/integration/var') - ->exclude('lib/internal/Cm') - ->exclude('lib/internal/Credis') - ->exclude('lib/internal/Less') - ->exclude('lib/internal/LinLibertineFont') - ->exclude('pub/media') - ->exclude('pub/static') - ->exclude('setup/vendor') - ->exclude('var'); return PhpCsFixer\Config::create() - ->setFinder($finder) + ->setRiskyAllowed(true) ->setRules([ '@PSR2' => true, 'array_syntax' => ['syntax' => 'short'], 'concat_space' => ['spacing' => 'one'], 'include' => true, + 'is_null' => ['use_yoda_style' => false], + 'method_separation' => true, 'new_with_braces' => true, 'no_empty_statement' => true, 'no_extra_consecutive_blank_lines' => true, @@ -46,4 +33,19 @@ return PhpCsFixer\Config::create() 'ordered_imports' => true, 'standardize_not_equals' => true, 'ternary_operator_spaces' => true, - ]); + ]) + ->setFinder( + PhpCsFixer\Finder::create() + ->name('*.phtml') + ->exclude('dev/tests/functional/generated') + ->exclude('dev/tests/functional/var') + ->exclude('dev/tests/functional/vendor') + ->exclude('dev/tests/integration/tmp') + ->exclude('dev/tests/integration/var') + ->exclude('generated') + ->exclude('lib/internal/LinLibertineFont') + ->exclude('pub/media') + ->exclude('pub/static') + ->exclude('setup/vendor') + ->exclude('var') + ); diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php index 7988bc736df14..80966c38a40e1 100644 --- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php +++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php @@ -6,8 +6,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\AdminNotification\Block\Grid\Renderer; class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer @@ -39,9 +37,8 @@ public function __construct( */ public function render(\Magento\Framework\DataObject $row) { - $readDetailsHtml = $row->getUrl() ? '' . __( - 'Read Details' - ) . '' : ''; + $readDetailsHtml = $row->getUrl() ? '' + . __('Read Details') . '' : ''; $markAsReadHtml = !$row->getIsRead() ? '
- + escapeHtml(__('FDS Filter Action')); ?>: escapeHtml($fraudDetails['fds_filter_action']); ?>
- + escapeHtml(__('AVS Response')); ?>: escapeHtml($fraudDetails['avs_response']); ?>
- + escapeHtml(__('Card Code Response')); ?>: escapeHtml($fraudDetails['card_code_response']); ?>
- + escapeHtml(__('CAVV Response')); ?>: escapeHtml($fraudDetails['cavv_response']); ?>
- + escapeHtml(__('Fraud Filters')); ?>:
- + escapeHtml($filter['name']); ?>: escapeHtml($filter['action']); ?>
diff --git a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php index 992c37a23e5d1..798d1816a9a7b 100644 --- a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php +++ b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php @@ -7,8 +7,8 @@ */ namespace Magento\Backend\App\Action\Plugin; -use Magento\Framework\App\RequestInterface; use Magento\Backend\App\AbstractAction; +use Magento\Framework\App\RequestInterface; class MassactionKey { diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php index 9208a3d71ceac..bb60a1e69dd47 100644 --- a/app/code/Magento/Backend/App/Config.php +++ b/app/code/Magento/Backend/App/Config.php @@ -6,8 +6,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\App; use Magento\Config\App\Config\Type\System; diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php index 237644429847b..e3de182751cb7 100644 --- a/app/code/Magento/Backend/Block/Dashboard.php +++ b/app/code/Magento/Backend/Block/Dashboard.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block; /** diff --git a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php index cb23e2a761457..fcd1243ffa9d1 100644 --- a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php +++ b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php @@ -4,10 +4,10 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Dashboard; +use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection; + /** * Adminhtml dashboard tab abstract * @@ -40,7 +40,7 @@ public function __construct( } /** - * @return array|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract + * @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract */ public function getCollection() { diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php index 46e8716ce6c8b..1320f26d4dfc3 100644 --- a/app/code/Magento/Backend/Block/Menu.php +++ b/app/code/Magento/Backend/Block/Menu.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block; /** @@ -135,7 +133,9 @@ protected function _getAnchorLabel($menuItem) */ protected function _renderMouseEvent($menuItem) { - return $menuItem->hasChildren() ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"' : ''; + return $menuItem->hasChildren() + ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"' + : ''; } /** @@ -150,9 +150,9 @@ protected function _renderItemCssClass($menuItem, $level) $isLast = 0 == $level && (bool)$this->getMenuModel()->isLast($menuItem) ? 'last' : ''; $output = ($this->menuItemChecker->isItemActive( $this->getActiveItemModel(), - $menuItem, - $level - ) ? '_current _active' : '') . + $menuItem, + $level + ) ? '_current _active' : '') . ' ' . ($menuItem->hasChildren() ? 'parent' : '') . ' ' . @@ -411,7 +411,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = []) */ public function getActiveItemModel() { - if (is_null($this->_activeItemModel)) { + if ($this->_activeItemModel === null) { $this->_activeItemModel = $this->getMenuModel()->get($this->getActive()); if (false == $this->_activeItemModel instanceof \Magento\Backend\Model\Menu\Item) { $this->_activeItemModel = false; diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php index 05c7d7a0daef4..f9893a708e87d 100644 --- a/app/code/Magento/Backend/Block/Page/Header.php +++ b/app/code/Magento/Backend/Block/Page/Header.php @@ -4,10 +4,10 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Page; +use Magento\Store\Model\ScopeInterface; + /** * Adminhtml header block * @@ -81,6 +81,6 @@ public function getLogoutLink() */ public function displayNoscriptNotice() { - return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE); + return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', ScopeInterface::SCOPE_STORE); } } diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php index 0dfc464264cf2..81a80f1cb3bab 100644 --- a/app/code/Magento/Backend/Block/Page/Notices.php +++ b/app/code/Magento/Backend/Block/Page/Notices.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - /** * Adminhtml header notices block * @@ -13,6 +11,8 @@ */ namespace Magento\Backend\Block\Page; +use Magento\Store\Model\ScopeInterface; + /** * @api */ @@ -25,7 +25,7 @@ class Notices extends \Magento\Backend\Block\Template */ public function displayNoscriptNotice() { - return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE); + return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', ScopeInterface::SCOPE_STORE); } /** @@ -35,6 +35,6 @@ public function displayNoscriptNotice() */ public function displayDemoNotice() { - return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE); + return $this->_scopeConfig->getValue('design/head/demonotice', ScopeInterface::SCOPE_STORE); } } diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php index ceef5b8ae114b..c837ad45ffeae 100644 --- a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php +++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Page\System\Config\Robots; use Magento\Framework\App\Config\ScopeConfigInterface; @@ -53,7 +51,8 @@ protected function _construct() public function getRobotsDefaultCustomInstructions() { return trim((string)$this->_scopeConfig->getValue( - self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, ScopeConfigInterface::SCOPE_TYPE_DEFAULT + self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, + ScopeConfigInterface::SCOPE_TYPE_DEFAULT )); } diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php index d73908d84cb80..a74e103bf4b21 100644 --- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php +++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php @@ -4,14 +4,14 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Store\Switcher\Form\Renderer; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; + /** * Form fieldset renderer */ -class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface +class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface { /** * Form element which re-rendering diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php index f7f44589d3fd9..5a09e1f17f617 100644 --- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php +++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\System\Design\Edit\Tab; class General extends \Magento\Backend\Block\Widget\Form\Generic @@ -66,7 +64,7 @@ protected function _prepareForm() ] ); $renderer = $this->getLayout()->createBlock( - \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class + \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class ); $field->setRenderer($renderer); } else { diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php index a899bf75994c6..a72857bd1f8a0 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php @@ -37,7 +37,7 @@ class Container extends \Magento\Backend\Block\Widget\Container * @var string */ protected $_blockGroup = 'Magento_Backend'; - + /** * @var string */ diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php index 2c1cd48940fc7..a59afc6248577 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php @@ -4,18 +4,17 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Form\Renderer; use Magento\Framework\Data\Form\Element\AbstractElement; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; /** * Form element default renderer * * @author Magento Core Team */ -class Element extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface +class Element extends \Magento\Backend\Block\Template implements RendererInterface { /** * @var AbstractElement diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php index 2e8c89482dfe8..20e888aefb09b 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php @@ -4,11 +4,10 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Form\Renderer; use Magento\Framework\Data\Form\Element\AbstractElement; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; /** * Form fieldset default renderer @@ -16,7 +15,7 @@ * @api * @author Magento Core Team */ -class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface +class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface { /** * @var AbstractElement diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php index bd59f9d9e7a27..ce5f8ca1d37f6 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php @@ -4,18 +4,17 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Form\Renderer\Fieldset; use Magento\Framework\Data\Form\Element\AbstractElement; +use Magento\Framework\Data\Form\Element\Renderer\RendererInterface; /** * Fieldset element renderer * * @author Magento Core Team */ -class Element extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface +class Element extends \Magento\Backend\Block\Template implements RendererInterface { /** * @var AbstractElement diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php index 35ed0cdfd6d97..f15dda0566cd5 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid.php +++ b/app/code/Magento/Backend/Block/Widget/Grid.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget; /** @@ -351,7 +349,7 @@ protected function _prepareCollection() $dir = $this->getParam($this->getVarNameDir(), $this->_defaultDir); $filter = $this->getParam($this->getVarNameFilter(), null); - if (is_null($filter)) { + if ($filter === null) { $filter = $this->_defaultFilter; } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php index 9f2ce62ecf96c..fc68884351e3b 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Grid\Column\Filter; /** diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php index ae1940e9c34d6..36a559e2b058a 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php @@ -56,7 +56,7 @@ public function render(DataObject $row) $result .= $this->getColumn()->getEditOnly() ? '' : '' . $this->_getValue($row) . ''; - return $result . $this->_getInputValueElement($row) . '
' ; + return $result . $this->_getInputValueElement($row) . ''; } return $this->_getValue($row); } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php index cd67aea7cf836..6c6e4ba97ff49 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Grid\Column\Renderer; /** @@ -155,7 +153,11 @@ protected function _transformActionData(&$action, &$actionCaption, \Magento\Fram break; case 'popup': - $action['onclick'] = 'popWin(this.href,\'_blank\',\'width=800,height=700,resizable=1,scrollbars=1\');return false;'; + $action['onclick'] = 'popWin( + this.href, + \'_blank\', + \'width=800,height=700,resizable=1,scrollbars=1\' + );return false;'; break; } } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php index 88718e669ded7..aa95e77355a8b 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Grid\Column\Renderer; /** diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php index 6ff6b2ced92d7..ce1cb078839a8 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php @@ -64,11 +64,11 @@ public function render(\Magento\Framework\DataObject $row) protected function _getCheckboxHtml($value, $checked) { $id = 'id_' . rand(0, 999); - $html = ''; return $html; } } diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php index 6b3369607ca28..3ba877bd9be44 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Block\Widget\Grid; use Magento\Framework\App\Filesystem\DirectoryList; @@ -263,7 +261,7 @@ public function _exportIterateCollection($callback, array $args) $originalCollection->setPageSize($this->getExportPageSize()); $originalCollection->setCurPage($page); $originalCollection->load(); - if (is_null($count)) { + if ($count === null) { $count = $originalCollection->getSize(); $lPage = $originalCollection->getLastPageNumber(); } @@ -286,8 +284,10 @@ public function _exportIterateCollection($callback, array $args) * @param \Magento\Framework\Filesystem\File\WriteInterface $stream * @return void */ - protected function _exportCsvItem(\Magento\Framework\DataObject $item, \Magento\Framework\Filesystem\File\WriteInterface $stream) - { + protected function _exportCsvItem( + \Magento\Framework\DataObject $item, + \Magento\Framework\Filesystem\File\WriteInterface $stream + ) { $row = []; foreach ($this->_getColumns() as $column) { if (!$column->getIsSystem()) { diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php index 338a786a8b88d..c19371a9dd100 100644 --- a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php +++ b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php @@ -6,10 +6,10 @@ namespace Magento\Backend\Console\Command; +use Magento\Framework\App\Cache\Manager; use Magento\Framework\Event\ManagerInterface as EventManagerInterface; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Magento\Framework\App\Cache\Manager; abstract class AbstractCacheTypeManageCommand extends AbstractCacheManageCommand { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php index 1895bd08c464f..de29cfa81b449 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php index 521cb9806a135..59d28896ac59c 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache { diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php index 6e514357433d7..ab3d4b3323f05 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\State; use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; /** * Controller disables some types of cache diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php index 99997e916129d..bfa1c8ab73f34 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php @@ -6,10 +6,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; -use Magento\Framework\Controller\ResultFactory; -use Magento\Framework\App\State; use Magento\Framework\App\ObjectManager; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; /** * Controller enables some types of cache diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php index e18aa1555e11b..780c8f950e2ee 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php @@ -6,8 +6,8 @@ */ namespace Magento\Backend\Controller\Adminhtml\Cache; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache { 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 0e35e6ad55049..363d052abb3b1 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php @@ -5,11 +5,10 @@ */ namespace Magento\Backend\Controller\Adminhtml\System\Account; -use Magento\Framework\Validator\Exception as ValidatorException; -use Magento\Framework\Exception\AuthenticationException; -use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\State\UserLockedException; +use Magento\Framework\Validator\Exception as ValidatorException; use Magento\Security\Model\SecurityCookie; /** diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php index a4bfef19dd275..301e2b557230d 100644 --- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php +++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Controller\Adminhtml\System; use Magento\Backend\App\Action; diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php index 5c0b883ed9d6e..6ddf4c1b88dc1 100644 --- a/app/code/Magento/Backend/Model/Auth.php +++ b/app/code/Magento/Backend/Model/Auth.php @@ -176,7 +176,7 @@ public function login($username, $password) ['user_name' => $username, 'exception' => $e] ); self::throwException( - __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.') + __($e->getMessage() ?: 'You did not sign in correctly or your account is temporarily disabled.') ); } } diff --git a/app/code/Magento/Backend/Model/Menu/Director/Director.php b/app/code/Magento/Backend/Model/Menu/Director/Director.php index a21a22d22c251..7f36ec1509c8a 100644 --- a/app/code/Magento/Backend/Model/Menu/Director/Director.php +++ b/app/code/Magento/Backend/Model/Menu/Director/Director.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Model\Menu\Director; class Director extends \Magento\Backend\Model\Menu\AbstractDirector @@ -43,8 +41,11 @@ protected function _getCommand($data, $logger) * @param \Psr\Log\LoggerInterface $logger * @return void */ - public function direct(array $config, \Magento\Backend\Model\Menu\Builder $builder, \Psr\Log\LoggerInterface $logger) - { + public function direct( + array $config, + \Magento\Backend\Model\Menu\Builder $builder, + \Psr\Log\LoggerInterface $logger + ) { foreach ($config as $data) { $builder->processCommand($this->_getCommand($data, $logger)); } diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php index 2c072c051388b..7a20d1b7aa302 100644 --- a/app/code/Magento/Backend/Model/Session/Quote.php +++ b/app/code/Magento/Backend/Model/Session/Quote.php @@ -151,7 +151,7 @@ public function getQuote() $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId()); $this->_quote->setIsActive(false); $this->_quote->setStoreId($this->getStoreId()); - + $this->quoteRepository->save($this->_quote); $this->setQuoteId($this->_quote->getId()); $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]); diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php index 45780e8ebc39e..e589aff4049f5 100644 --- a/app/code/Magento/Backend/Model/Url.php +++ b/app/code/Magento/Backend/Model/Url.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Model; +use Magento\Framework\App\ObjectManager; use Magento\Framework\Serialize\Serializer\Json; use Magento\Framework\Url\HostChecker; -use Magento\Framework\App\ObjectManager; /** * Class \Magento\Backend\Model\UrlInterface diff --git a/app/code/Magento/Backend/Model/View/Layout/Builder.php b/app/code/Magento/Backend/Model/View/Layout/Builder.php index f77b652f74051..6e3b3015490d9 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Builder.php +++ b/app/code/Magento/Backend/Model/View/Layout/Builder.php @@ -5,10 +5,6 @@ */ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\App; -use Magento\Framework\Event; -use Magento\Framework\View; - class Builder extends \Magento\Framework\View\Layout\Builder { /** diff --git a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php index 42b69cacdeef1..f2f325d531dd2 100644 --- a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php +++ b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php @@ -5,8 +5,8 @@ */ namespace Magento\Backend\Model\View\Layout\Reader; -use Magento\Framework\View\Layout; use Magento\Framework\Data\Argument\InterpreterInterface; +use Magento\Framework\View\Layout; use Magento\Framework\View\Layout\Reader\Visibility\Condition; /** diff --git a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php index 5a075c1da634b..67d04aca2f7a3 100644 --- a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php +++ b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php @@ -6,8 +6,8 @@ namespace Magento\Backend\Model\View\Layout; -use Magento\Framework\View\Layout\ScheduledStructure; use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class StructureManager diff --git a/app/code/Magento/Backend/Model/View/Page/Builder.php b/app/code/Magento/Backend/Model/View/Page/Builder.php index 750186e1cf7be..a07cec4a6dea7 100644 --- a/app/code/Magento/Backend/Model/View/Page/Builder.php +++ b/app/code/Magento/Backend/Model/View/Page/Builder.php @@ -5,9 +5,6 @@ */ namespace Magento\Backend\Model\View\Page; -use Magento\Backend\Model\View\Layout; -use Magento\Framework\App; -use Magento\Framework\Event; use Magento\Framework\View; class Builder extends View\Page\Builder diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php index e59d062146968..5318b34edf078 100644 --- a/app/code/Magento/Backend/Model/View/Result/Page.php +++ b/app/code/Magento/Backend/Model/View/Result/Page.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Model\View\Result; -use Magento\Framework\Translate; use Magento\Framework\View; /** diff --git a/app/code/Magento/Backend/Model/View/Result/Redirect.php b/app/code/Magento/Backend/Model/View/Result/Redirect.php index fbb0f8bcd4694..6bc8fe798fdfd 100644 --- a/app/code/Magento/Backend/Model/View/Result/Redirect.php +++ b/app/code/Magento/Backend/Model/View/Result/Redirect.php @@ -7,7 +7,6 @@ use Magento\Backend\App\AbstractAction; use Magento\Backend\Model\Session; -use Magento\Backend\Model\UrlInterface; use Magento\Framework\App; use Magento\Framework\App\ActionFlag; use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface; diff --git a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php index d2772ed602ab6..4903d67809079 100644 --- a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php +++ b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Model\Widget\Grid; abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\TotalsInterface @@ -46,8 +44,10 @@ abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\Tota * @param \Magento\Framework\DataObject\Factory $factory * @param \Magento\Backend\Model\Widget\Grid\Parser $parser */ - public function __construct(\Magento\Framework\DataObject\Factory $factory, \Magento\Backend\Model\Widget\Grid\Parser $parser) - { + public function __construct( + \Magento\Framework\DataObject\Factory $factory, + \Magento\Backend\Model\Widget\Grid\Parser $parser + ) { $this->_factory = $factory; $this->_parser = $parser; } diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php index a840162cbd027..9b9638cc6bb66 100644 --- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php +++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php @@ -5,12 +5,12 @@ */ namespace Magento\Backend\Setup; +use Magento\Framework\App\DeploymentConfig; use Magento\Framework\Config\Data\ConfigData; use Magento\Framework\Config\File\ConfigFilePool; +use Magento\Framework\Setup\BackendFrontnameGenerator; use Magento\Framework\Setup\ConfigOptionsListInterface; use Magento\Framework\Setup\Option\TextConfigOption; -use Magento\Framework\App\DeploymentConfig; -use \Magento\Framework\Setup\BackendFrontnameGenerator; /* * Deployment configuration options needed for Backend module diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php index 3c82b1ad8073e..e5070167574a1 100644 --- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php +++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Test\Unit\App\Action\Plugin; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Backend\App\AbstractAction; use Magento\Framework\App\RequestInterface; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class MassactionKeyTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php index 5dd7deb6e0972..744e60dae1be3 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php @@ -5,9 +5,9 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; -use Magento\Backend\Model\Menu; use Magento\Backend\Block\MenuItemChecker; +use Magento\Backend\Model\Menu; +use Magento\Backend\Model\Menu\Item; class MenuItemCheckerTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php index 03714795d97c1..5e9e84c2d9fe4 100644 --- a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php +++ b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php @@ -5,16 +5,16 @@ */ namespace Magento\Backend\Test\Unit\Block; -use Magento\Backend\Model\Menu\Item; -use Magento\Backend\Model\Menu as MenuModel; +use Magento\Backend\Block\AnchorRenderer; use Magento\Backend\Block\Menu; -use Magento\Backend\Model\UrlInterface; -use Magento\Backend\Model\Menu\Filter\IteratorFactory; +use Magento\Backend\Block\MenuItemChecker; use Magento\Backend\Model\Auth\Session; +use Magento\Backend\Model\Menu as MenuModel; use Magento\Backend\Model\Menu\Config; +use Magento\Backend\Model\Menu\Filter\IteratorFactory; +use Magento\Backend\Model\Menu\Item; +use Magento\Backend\Model\UrlInterface; use Magento\Framework\Locale\ResolverInterface; -use Magento\Backend\Block\MenuItemChecker; -use Magento\Backend\Block\AnchorRenderer; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class MenuTest extends \PHPUnit_Framework_TestCase 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 cf50d3ea3a18c..a39d56df417ea 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 @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Test\Unit\Block\Widget\Grid; /** @@ -324,7 +322,8 @@ public function testGetTotals() ); $this->assertEquals( - new \Magento\Framework\DataObject(['test1' => '3', 'test2' => '2']), $this->_block->getTotals() + new \Magento\Framework\DataObject(['test1' => '3', 'test2' => '2']), + $this->_block->getTotals() ); } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php index 8c63fe91ae94e..ecc47b229b2e0 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; /** @@ -78,8 +76,7 @@ public function testExecute() $messageManager->expects($this->once()) ->method('addSuccess') - ->with('The JavaScript/CSS cache has been cleaned.' - ); + ->with('The JavaScript/CSS cache has been cleaned.'); $valueMap = [ [\Magento\Framework\View\Asset\MergeService::class, $mergeService], diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php index 4afcae48d2294..8cdebc55fe210 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; class CleanStaticFilesTest extends \PHPUnit_Framework_TestCase @@ -60,7 +58,7 @@ protected function setUp() $this->controller = $objectHelper->getObject( \Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles::class, - ['context' => $context,] + ['context' => $context] ); } diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php index 73facfffc6429..7ee3931db9a85 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php @@ -5,17 +5,17 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Magento\Backend\Controller\Adminhtml\Cache\MassDisable; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\App\State; use Magento\Backend\App\Action\Context; -use Magento\Framework\Message\ManagerInterface as MessageManager; -use Magento\Framework\Controller\ResultFactory; +use Magento\Backend\Controller\Adminhtml\Cache\MassDisable; use Magento\Backend\Model\View\Result\Redirect; -use Magento\Framework\App\RequestInterface as Request; -use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; use Magento\Framework\App\Cache\StateInterface as CacheState; +use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; +use Magento\Framework\App\RequestInterface as Request; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Message\ManagerInterface as MessageManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php index b03e1eb805613..6bf3641501856 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php @@ -5,17 +5,17 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache; -use PHPUnit_Framework_MockObject_MockObject as MockObject; -use Magento\Backend\Controller\Adminhtml\Cache\MassEnable; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\App\State; use Magento\Backend\App\Action\Context; -use Magento\Framework\Message\ManagerInterface as MessageManager; -use Magento\Framework\Controller\ResultFactory; +use Magento\Backend\Controller\Adminhtml\Cache\MassEnable; use Magento\Backend\Model\View\Result\Redirect; -use Magento\Framework\App\RequestInterface as Request; -use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; use Magento\Framework\App\Cache\StateInterface as CacheState; +use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList; +use Magento\Framework\App\RequestInterface as Request; +use Magento\Framework\App\State; +use Magento\Framework\Controller\ResultFactory; +use Magento\Framework\Message\ManagerInterface as MessageManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php index 76ce4e7b67a70..d55c27c30a1ac 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Dashboard; /** @@ -25,19 +23,31 @@ protected function assertExecute($controllerName, $blockName) $outPut = "data"; $resultRawMock = $this->getMock( \Magento\Framework\Controller\Result\Raw::class, - ['setContents'], [], '', false) - ; + ['setContents'], + [], + '', + false + ); $resultRawFactoryMock = $this->getMock( \Magento\Framework\Controller\Result\RawFactory::class, - ['create'], [], '', false + ['create'], + [], + '', + false ); $layoutFactoryMock = $this->getMock( \Magento\Framework\View\LayoutFactory::class, - ['create'], [], '', false + ['create'], + [], + '', + false ); $layoutMock = $this->getMock( \Magento\Framework\View\Layout::class, - ['createBlock', 'toHtml'], [], '', false + ['createBlock', 'toHtml'], + [], + '', + false ); $layoutFactoryMock->expects($this->once())->method('create')->will($this->returnValue($layoutMock)); $layoutMock->expects($this->once())->method('createBlock')->with($blockName)->will($this->returnSelf()); diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php index fba68c4d9ead6..ed78db1229643 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersMostTest.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Dashboard; /** diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php index 1256d89bb8d5c..6cf31649f8de5 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/CustomersNewestTest.php @@ -4,8 +4,6 @@ * See COPYING.txt for license details. */ -// @codingStandardsIgnoreFile - namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Dashboard; /** diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php index ab011aa157e45..8e19512400318 100644 --- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php +++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php @@ -6,9 +6,9 @@ */ namespace Magento\Backend\Test\Unit\Controller\Adminhtml\System\Store; -use Magento\Framework\Controller\ResultFactory; -use Magento\Backend\Model\View\Result\Page; use Magento\Backend\Controller\Adminhtml\System\Store\Index; +use Magento\Backend\Model\View\Result\Page; +use Magento\Framework\Controller\ResultFactory; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\View\Page\Config; use Magento\Framework\View\Page\Title; diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php index cff8ba5a7e2e1..15ef897190659 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php @@ -6,7 +6,6 @@ namespace Magento\Backend\Test\Unit\Model; use Magento\Backend\Model\AdminPathConfig; -use Magento\Store\Model\Store; class AdminPathConfigTest extends \PHPUnit_Framework_TestCase { diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php index f48c1fdeb8922..e786e82ebb3a3 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php @@ -28,7 +28,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session */ protected $_authSession; - + /** * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface */ @@ -45,14 +45,14 @@ protected function setUp() '', false ); - + $this->_backendConfig = $this->getMockForAbstractClass( \Magento\Backend\App\ConfigInterface::class, [], '', false ); - + $userMock = new \Magento\Framework\DataObject(); $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock)); diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php index 4118edaca2218..a577701ce1eb3 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php @@ -37,6 +37,6 @@ public function testAfterGetResult($isPub, $times) public function afterGetResultDataProvider() { - return [[true, 1], [false, 0],]; + return [[true, 1], [false, 0]]; } } diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php index 30ae58db3d550..2a22e7ac8a821 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php @@ -5,7 +5,6 @@ */ namespace Magento\Backend\Test\Unit\Model; -use Magento\Backend\Model\Menu\Item; use Magento\Backend\Model\Menu\Item\Factory; use Magento\Framework\Serialize\SerializerInterface; diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php index af861165b4950..e72950e88544d 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php @@ -9,8 +9,6 @@ */ namespace Magento\Backend\Test\Unit\Model\Session; -use Magento\TestFramework\ObjectManager; - class AdminConfigTest extends \PHPUnit_Framework_TestCase { /** diff --git a/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php b/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php index 4edba05e29c33..f7e3ba7e13d5b 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/UrlTest.php @@ -10,7 +10,6 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - * @codingStandardsIgnoreFile */ class UrlTest extends \PHPUnit_Framework_TestCase { @@ -90,7 +89,8 @@ protected function setUp() \Magento\Framework\Data\Form\FormKey::class, ['getFormKey'], [], - '', false + '', + false ); $this->_formKey->expects($this->any())->method('getFormKey')->will($this->returnValue('salt')); diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php index 52ae4177b5bfd..f061deaa0562e 100644 --- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php +++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php @@ -7,9 +7,9 @@ namespace Magento\Backend\Test\Unit\Model\View\Layout; use Magento\Backend\Model\View\Layout\StructureManager; -use Magento\Framework\View\Layout\ScheduledStructure; -use Magento\Framework\View\Layout\Data\Structure; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\Framework\View\Layout\Data\Structure; +use Magento\Framework\View\Layout\ScheduledStructure; /** * Class StructureManagerTest diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml index aef3e7f2f5396..aac74a9d71786 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml @@ -15,8 +15,8 @@ onchange="changeDiagramsPeriod(this);" class="admin__control-select"> helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?> + continue; +} ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml index 0090a4a9d163d..b6afdc79ab531 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml @@ -61,8 +61,8 @@ deps.push('Magento_Sales/order/create/form'); deps.push('mage/adminhtml/grid'); -require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ - +require(deps, function(getDependencyJsObject() ? 'registry' : '') ?>){ + getDependencyJsObject()): ?> registry.get('getDependencyJsObject() ?>', function (getDependencyJsObject() ?>) { diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml index 8bfbde8425fe2..3eb286d336238 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -36,22 +36,25 @@