+
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 3f658ee90bf4e..fb2daa283f111 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -205,10 +205,6 @@ private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractB
*/
public function dispatch(\Magento\Framework\App\RequestInterface $request)
{
- if (!$this->_processUrlKeys()) {
- return parent::dispatch($request);
- }
-
if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
$this->_response->setStatusHeader(403, '1.1', 'Forbidden');
if (!$this->_auth->isLoggedIn()) {
@@ -252,6 +248,9 @@ protected function _isUrlChecked()
* Check url keys. If non valid - redirect
*
* @return bool
+ *
+ * @see \Magento\Backend\App\Request\BackendValidator for default
+ * request validation.
*/
public function _processUrlKeys()
{
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
index 68506a521c1cf..4b25e9921e404 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
+++ b/app/code/Magento/Backend/App/Action/Plugin/Authentication.php
@@ -160,7 +160,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
} else {
$this->_actionFlag->set('', \Magento\Framework\App\ActionInterface::FLAG_NO_DISPATCH, true);
$this->_response->setRedirect($this->_url->getCurrentUrl());
- $this->messageManager->addError(__('Invalid Form Key. Please refresh the page.'));
+ $this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
$isRedirectNeeded = true;
}
}
@@ -205,7 +205,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
$this->_auth->login($username, $password);
} catch (AuthenticationException $e) {
if (!$request->getParam('messageSent')) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
$request->setParam('messageSent', true);
$outputValue = false;
}
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index df8b718389741..b790a2edc3fab 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -42,6 +42,6 @@ public function __construct(\Magento\Backend\App\ConfigInterface $config)
*/
public function getPart($code)
{
- return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
+ return $this->_parts[$code] ?? null;
}
}
diff --git a/app/code/Magento/Backend/App/Request/BackendValidator.php b/app/code/Magento/Backend/App/Request/BackendValidator.php
new file mode 100644
index 0000000000000..4d04d2fed8eb2
--- /dev/null
+++ b/app/code/Magento/Backend/App/Request/BackendValidator.php
@@ -0,0 +1,184 @@
+auth = $auth;
+ $this->formKeyValidator = $formKeyValidator;
+ $this->backendUrl = $backendUrl;
+ $this->redirectFactory = $redirectFactory;
+ $this->rawResultFactory = $rawResultFactory;
+ }
+
+ /**
+ * Validate request
+ *
+ * @param RequestInterface $request
+ * @param ActionInterface $action
+ *
+ * @return bool
+ */
+ private function validateRequest(
+ RequestInterface $request,
+ ActionInterface $action
+ ): bool {
+ /** @var bool|null $valid */
+ $valid = null;
+
+ if ($action instanceof CsrfAwareActionInterface) {
+ $valid = $action->validateForCsrf($request);
+ }
+
+ if ($valid === null) {
+ $validFormKey = true;
+ $validSecretKey = true;
+ if ($request instanceof HttpRequest && $request->isPost()) {
+ $validFormKey = $this->formKeyValidator->validate($request);
+ } elseif ($this->auth->isLoggedIn()
+ && $this->backendUrl->useSecretKey()
+ ) {
+ $secretKeyValue = (string)$request->getParam(
+ BackendUrl::SECRET_KEY_PARAM_NAME,
+ null
+ );
+ $secretKey = $this->backendUrl->getSecretKey();
+ $validSecretKey = ($secretKeyValue === $secretKey);
+ }
+ $valid = $validFormKey && $validSecretKey;
+ }
+
+ return $valid;
+ }
+
+ /**
+ * Create exception
+ *
+ * @param RequestInterface $request
+ * @param ActionInterface $action
+ *
+ * @return InvalidRequestException
+ */
+ private function createException(
+ RequestInterface $request,
+ ActionInterface $action
+ ): InvalidRequestException {
+ /** @var InvalidRequestException|null $exception */
+ $exception = null;
+
+ if ($action instanceof CsrfAwareActionInterface) {
+ $exception = $action->createCsrfValidationException($request);
+ }
+
+ if ($exception === null) {
+ if ($request instanceof HttpRequest && $request->isAjax()) {
+ //Sending empty response for AJAX request since we don't know
+ //the expected response format and it's pointless to redirect.
+ /** @var RawResult $response */
+ $response = $this->rawResultFactory->create();
+ $response->setHttpResponseCode(401);
+ $response->setContents('');
+ $exception = new InvalidRequestException($response);
+ } else {
+ //For regular requests.
+ $response = $this->redirectFactory->create()
+ ->setUrl($this->backendUrl->getStartupPageUrl());
+ $exception = new InvalidRequestException(
+ $response,
+ [
+ new Phrase(
+ 'Invalid security or form key. Please refresh the page.'
+ )
+ ]
+ );
+ }
+ }
+
+ return $exception;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function validate(
+ RequestInterface $request,
+ ActionInterface $action
+ ): void {
+ if ($action instanceof AbstractAction) {
+ //Abstract Action has built-in validation.
+ if (!$action->_processUrlKeys()) {
+ throw new InvalidRequestException($action->getResponse());
+ }
+ } else {
+ //Fallback validation.
+ if (!$this->validateRequest($request, $action)) {
+ throw $this->createException($request, $action);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php
index 29557f12c1093..7ccb2d51ccd1b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Bar.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php
@@ -38,14 +38,6 @@ public function getTotals()
*/
public function addTotal($label, $value, $isQuantity = false)
{
- /*if (!$isQuantity) {
- $value = $this->format($value);
- $decimals = substr($value, -2);
- $value = substr($value, 0, -2);
- } else {
- $value = ($value != '')?$value:0;
- $decimals = '';
- }*/
if (!$isQuantity) {
$value = $this->format($value);
}
diff --git a/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php b/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php
new file mode 100644
index 0000000000000..9c17b0e5538f4
--- /dev/null
+++ b/app/code/Magento/Backend/Block/DataProviders/ImageUploadConfig.php
@@ -0,0 +1,40 @@
+imageUploadConfig = $imageUploadConfig;
+ }
+
+ /**
+ * Get image resize configuration
+ *
+ * @return int
+ */
+ public function getIsResizeEnabled(): int
+ {
+ return (int)$this->imageUploadConfig->isResizeEnabled();
+ }
+}
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
index 5bad74d8a8be5..84fa487281ac8 100644
--- a/app/code/Magento/Backend/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -3,10 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Backend\Block\Media;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Image\Adapter\UploadConfigInterface;
+use Magento\Backend\Model\Image\UploadResizeConfigInterface;
/**
* Adminhtml media library uploader
@@ -35,24 +39,46 @@ class Uploader extends \Magento\Backend\Block\Widget
*/
private $jsonEncoder;
+ /**
+ * @var UploadResizeConfigInterface
+ */
+ private $imageUploadConfig;
+
+ /**
+ * @var UploadConfigInterface
+ * @deprecated
+ * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface
+ */
+ private $imageConfig;
+
/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Framework\File\Size $fileSize
* @param array $data
* @param Json $jsonEncoder
+ * @param UploadConfigInterface $imageConfig
+ * @param UploadResizeConfigInterface $imageUploadConfig
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Framework\File\Size $fileSize,
array $data = [],
- Json $jsonEncoder = null
+ Json $jsonEncoder = null,
+ UploadConfigInterface $imageConfig = null,
+ UploadResizeConfigInterface $imageUploadConfig = null
) {
$this->_fileSizeService = $fileSize;
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
+ $this->imageConfig = $imageConfig
+ ?: ObjectManager::getInstance()->get(UploadConfigInterface::class);
+ $this->imageUploadConfig = $imageUploadConfig
+ ?: ObjectManager::getInstance()->get(UploadResizeConfigInterface::class);
parent::__construct($context, $data);
}
/**
+ * Initialize block.
+ *
* @return void
*/
protected function _construct()
@@ -90,6 +116,26 @@ public function getFileSizeService()
return $this->_fileSizeService;
}
+ /**
+ * Get Image Upload Maximum Width Config.
+ *
+ * @return int
+ */
+ public function getImageUploadMaxWidth()
+ {
+ return $this->imageUploadConfig->getMaxWidth();
+ }
+
+ /**
+ * Get Image Upload Maximum Height Config.
+ *
+ * @return int
+ */
+ public function getImageUploadMaxHeight()
+ {
+ return $this->imageUploadConfig->getMaxHeight();
+ }
+
/**
* Prepares layout and set element renderer
*
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index 7d86497288a69..1e2561e2efe05 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -9,12 +9,12 @@
/**
* Backend menu block
*
- * @api
- * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
+ * @method $this setAdditionalCacheKeyInfo(array $cacheKeyInfo)
* @method array getAdditionalCacheKeyInfo()
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Menu extends \Magento\Backend\Block\Template
{
@@ -75,7 +75,12 @@ class Menu extends \Magento\Backend\Block\Template
private $anchorRenderer;
/**
- * @param Template\Context $context
+ * @var \Magento\Framework\App\Route\ConfigInterface
+ */
+ private $routeConfig;
+
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Model\UrlInterface $url
* @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
* @param \Magento\Backend\Model\Auth\Session $authSession
@@ -84,6 +89,9 @@ class Menu extends \Magento\Backend\Block\Template
* @param array $data
* @param MenuItemChecker|null $menuItemChecker
* @param AnchorRenderer|null $anchorRenderer
+ * @param \Magento\Framework\App\Route\ConfigInterface|null $routeConfig
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
@@ -94,7 +102,8 @@ public function __construct(
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = [],
MenuItemChecker $menuItemChecker = null,
- AnchorRenderer $anchorRenderer = null
+ AnchorRenderer $anchorRenderer = null,
+ \Magento\Framework\App\Route\ConfigInterface $routeConfig = null
) {
$this->_url = $url;
$this->_iteratorFactory = $iteratorFactory;
@@ -103,6 +112,9 @@ public function __construct(
$this->_localeResolver = $localeResolver;
$this->menuItemChecker = $menuItemChecker;
$this->anchorRenderer = $anchorRenderer;
+ $this->routeConfig = $routeConfig ?:
+ \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\App\Route\ConfigInterface::class);
parent::__construct($context, $data);
}
@@ -130,6 +142,7 @@ protected function _getAnchorLabel($menuItem)
/**
* Render menu item mouse events
+ *
* @param \Magento\Backend\Model\Menu\Item $menuItem
* @return string
*/
@@ -203,8 +216,9 @@ protected function _afterToHtml($html)
*/
protected function _callbackSecretKey($match)
{
+ $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
- $match[1],
+ $routeId ?: $match[1],
$match[2],
$match[3]
);
@@ -342,7 +356,7 @@ protected function _columnBrake($items, $limit)
* @param \Magento\Backend\Model\Menu\Item $menuItem
* @param int $level
* @param int $limit
- * @param $id int
+ * @param int|null $id
* @return string HTML code
*/
protected function _addSubMenu($menuItem, $level, $limit, $id = null)
diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
index 3d1570e5ddfe7..e0c173a4cbfec 100644
--- a/app/code/Magento/Backend/Block/Page/Footer.php
+++ b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -40,7 +40,7 @@ public function __construct(
}
/**
- * @return void
+ * @inheritdoc
*/
protected function _construct()
{
@@ -57,4 +57,12 @@ public function getMagentoVersion()
{
return $this->productMetadata->getVersion();
}
+
+ /**
+ * @inheritdoc
+ */
+ protected function getCacheLifetime()
+ {
+ return 3600 * 24 * 10;
+ }
}
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
index e479e8f560dae..47a156c16ce3e 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Backend\Block\System\Store\Delete;
+use Magento\Backup\Helper\Data as BackupHelper;
+use Magento\Framework\App\ObjectManager;
+
/**
* Adminhtml cms block edit form
*
@@ -12,6 +15,25 @@
*/
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
+ /**
+ * @var BackupHelper
+ */
+ private $backup;
+
+ /**
+ * @inheritDoc
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Framework\Registry $registry,
+ \Magento\Framework\Data\FormFactory $formFactory,
+ array $data = [],
+ ?BackupHelper $backup = null
+ ) {
+ parent::__construct($context, $registry, $formFactory, $data);
+ $this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class);
+ }
+
/**
* Init form
*
@@ -25,7 +47,7 @@ protected function _construct()
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
protected function _prepareForm()
{
@@ -45,6 +67,12 @@ protected function _prepareForm()
$fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);
+ $backupOptions = ['0' => __('No')];
+ $backupSelected = '0';
+ if ($this->backup->isEnabled()) {
+ $backupOptions['1'] = __('Yes');
+ $backupSelected = '1';
+ }
$fieldset->addField(
'create_backup',
'select',
@@ -52,8 +80,8 @@ protected function _prepareForm()
'label' => __('Create DB Backup'),
'title' => __('Create DB Backup'),
'name' => 'create_backup',
- 'options' => ['1' => __('Yes'), '0' => __('No')],
- 'value' => '1'
+ 'options' => $backupOptions,
+ 'value' => $backupSelected
]
);
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
index ae80b56066a6d..e95f3bbf9f8c1 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
@@ -19,7 +19,7 @@ protected function _prepareLayout()
{
$itemId = $this->getRequest()->getParam('group_id');
- $this->setTemplate('system/store/delete_group.phtml');
+ $this->setTemplate('Magento_Backend::system/store/delete_group.phtml');
$this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', ['group_id' => $itemId]));
$this->addChild(
'confirm_deletion_button',
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
index da28a471130cc..82cbb780137b8 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
@@ -19,7 +19,7 @@ protected function _prepareLayout()
{
$itemId = $this->getRequest()->getParam('website_id');
- $this->setTemplate('system/store/delete_website.phtml');
+ $this->setTemplate('Magento_Backend::system/store/delete_website.phtml');
$this->setAction($this->getUrl('adminhtml/*/deleteWebsitePost', ['website_id' => $itemId]));
$this->addChild(
'confirm_deletion_button',
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index 6efc8d86802ce..27c777c6d4009 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -17,7 +17,9 @@
* the classes they were introduced for.
*
* @api
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @since 100.0.2
*/
class Context extends \Magento\Framework\View\Element\Template\Context
@@ -173,6 +175,8 @@ public function getAuthorization()
}
/**
+ * Get backend session instance.
+ *
* @return \Magento\Backend\Model\Session
*/
public function getBackendSession()
@@ -181,6 +185,8 @@ public function getBackendSession()
}
/**
+ * Get math random instance.
+ *
* @return \Magento\Framework\Math\Random
*/
public function getMathRandom()
@@ -189,6 +195,8 @@ public function getMathRandom()
}
/**
+ * Get form key instance.
+ *
* @return \Magento\Framework\Data\Form\FormKey
*/
public function getFormKey()
@@ -197,7 +205,9 @@ public function getFormKey()
}
/**
- * @return \Magento\Framework\Data\Form\FormKey
+ * Get name builder instance.
+ *
+ * @return \Magento\Framework\Code\NameBuilder
*/
public function getNameBuilder()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
index 94af9a1d7578f..5a792ddb39132 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/ButtonList.php
@@ -7,6 +7,8 @@
namespace Magento\Backend\Block\Widget\Button;
/**
+ * Button list widget
+ *
* @api
* @since 100.0.2
*/
@@ -127,12 +129,6 @@ public function getItems()
*/
public function sortButtons(Item $itemA, Item $itemB)
{
- $sortOrderA = intval($itemA->getSortOrder());
- $sortOrderB = intval($itemB->getSortOrder());
-
- if ($sortOrderA == $sortOrderB) {
- return 0;
- }
- return ($sortOrderA < $sortOrderB) ? -1 : 1;
+ return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
}
}
diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php
index 30221618edbed..38d5d90a22d15 100644
--- a/app/code/Magento/Backend/Block/Widget/Form.php
+++ b/app/code/Magento/Backend/Block/Widget/Form.php
@@ -3,8 +3,11 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Backend\Block\Widget;
+use Magento\Framework\App\ObjectManager;
+
/**
* Backend form widget
*
@@ -27,13 +30,23 @@ class Form extends \Magento\Backend\Block\Widget
*/
protected $_template = 'Magento_Backend::widget/form.phtml';
+ /** @var Form\Element\ElementCreator */
+ private $creator;
+
/**
+ * Constructs form
+ *
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
+ * @param Form\Element\ElementCreator|null $creator
*/
- public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
- {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ array $data = [],
+ Form\Element\ElementCreator $creator = null
+ ) {
parent::__construct($context, $data);
+ $this->creator = $creator ?: ObjectManager::getInstance()->get(Form\Element\ElementCreator::class);
}
/**
@@ -46,7 +59,6 @@ protected function _construct()
parent::_construct();
$this->setDestElementId('edit_form');
- $this->setShowGlobalIcon(false);
}
/**
@@ -148,6 +160,7 @@ protected function _beforeToHtml()
/**
* Initialize form fields values
+ *
* Method will be called after prepareForm and can be used for field values initialization
*
* @return $this
@@ -173,32 +186,11 @@ protected function _setFieldset($attributes, $fieldset, $exclude = [])
if (!$this->_isAttributeVisible($attribute)) {
continue;
}
- if (($inputType = $attribute->getFrontend()->getInputType()) && !in_array(
- $attribute->getAttributeCode(),
- $exclude
- ) && ('media_image' != $inputType || $attribute->getAttributeCode() == 'image')
+ if (($inputType = $attribute->getFrontend()->getInputType())
+ && !in_array($attribute->getAttributeCode(), $exclude)
+ && ('media_image' !== $inputType || $attribute->getAttributeCode() == 'image')
) {
- $fieldType = $inputType;
- $rendererClass = $attribute->getFrontend()->getInputRendererClass();
- if (!empty($rendererClass)) {
- $fieldType = $inputType . '_' . $attribute->getAttributeCode();
- $fieldset->addType($fieldType, $rendererClass);
- }
-
- $element = $fieldset->addField(
- $attribute->getAttributeCode(),
- $fieldType,
- [
- 'name' => $attribute->getAttributeCode(),
- 'label' => $attribute->getFrontend()->getLocalizedLabel(),
- 'class' => $attribute->getFrontend()->getClass(),
- 'required' => $attribute->getIsRequired(),
- 'note' => $attribute->getNote()
- ]
- )->setEntityAttribute(
- $attribute
- );
-
+ $element = $this->creator->create($fieldset, $attribute);
$element->setAfterElementHtml($this->_getAdditionalElementHtml($element));
$this->_applyTypeSpecificConfig($inputType, $element, $attribute);
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index 8b7babc1bb9b6..97116de6db79b 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -93,7 +93,7 @@ protected function _construct()
'class' => 'delete',
'onclick' => 'deleteConfirm(\'' . __(
'Are you sure you want to do this?'
- ) . '\', \'' . $this->getDeleteUrl() . '\')'
+ ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})'
]
);
}
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index 723deab1e9f7e..d599d5fbad5e0 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -4,14 +4,13 @@
* See COPYING.txt for license details.
*/
+namespace Magento\Backend\Block\Widget\Form\Element;
+
/**
* Form element dependencies mapper
* Assumes that one element may depend on other element values.
* Will toggle as "enabled" only if all elements it depends from toggle as true.
- */
-namespace Magento\Backend\Block\Widget\Form\Element;
-
-/**
+ *
* @api
* @since 100.0.2
*/
@@ -117,6 +116,7 @@ public function addConfigOptions(array $options)
/**
* HTML output getter
+ *
* @return string
*/
protected function _toHtml()
@@ -124,18 +124,23 @@ protected function _toHtml()
if (!$this->_depends) {
return '';
}
- return '';
+
+ $params = $this->_getDependsJson();
+
+ if ($this->_configOptions) {
+ $params .= ', ' . $this->_jsonEncoder->encode($this->_configOptions);
+ }
+
+ return "";
}
/**
- * Field dependences JSON map generator
+ * Field dependencies JSON map generator
+ *
* @return string
*/
protected function _getDependsJson()
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
new file mode 100644
index 0000000000000..b9cdd259796d0
--- /dev/null
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
@@ -0,0 +1,136 @@
+modifiers = $modifiers;
+ }
+
+ /**
+ * Creates element
+ *
+ * @param Fieldset $fieldset
+ * @param Attribute $attribute
+ *
+ * @return AbstractElement
+ */
+ public function create(Fieldset $fieldset, Attribute $attribute): AbstractElement
+ {
+ $config = $this->getElementConfig($attribute);
+
+ if (!empty($config['rendererClass'])) {
+ $fieldType = $config['inputType'] . '_' . $attribute->getAttributeCode();
+ $fieldset->addType($fieldType, $config['rendererClass']);
+ }
+
+ return $fieldset
+ ->addField($config['attribute_code'], $config['inputType'], $config)
+ ->setEntityAttribute($attribute);
+ }
+
+ /**
+ * Returns element config
+ *
+ * @param Attribute $attribute
+ * @return array
+ */
+ private function getElementConfig(Attribute $attribute): array
+ {
+ $defaultConfig = $this->createDefaultConfig($attribute);
+ $config = $this->modifyConfig($defaultConfig);
+
+ $config['label'] = __($config['label']);
+
+ return $config;
+ }
+
+ /**
+ * Returns default config
+ *
+ * @param Attribute $attribute
+ * @return array
+ */
+ private function createDefaultConfig(Attribute $attribute): array
+ {
+ return [
+ 'inputType' => $attribute->getFrontend()->getInputType(),
+ 'rendererClass' => $attribute->getFrontend()->getInputRendererClass(),
+ 'attribute_code' => $attribute->getAttributeCode(),
+ 'name' => $attribute->getAttributeCode(),
+ 'label' => $attribute->getFrontend()->getLabel(),
+ 'class' => $attribute->getFrontend()->getClass(),
+ 'required' => $attribute->getIsRequired(),
+ 'note' => $attribute->getNote(),
+ ];
+ }
+
+ /**
+ * Modify config
+ *
+ * @param array $config
+ * @return array
+ */
+ private function modifyConfig(array $config): array
+ {
+ if ($this->isModified($config['attribute_code'])) {
+ return $this->applyModifier($config);
+ }
+ return $config;
+ }
+
+ /**
+ * Returns bool if attribute need to modify
+ *
+ * @param string $attribute_code
+ * @return bool
+ */
+ private function isModified($attribute_code): bool
+ {
+ return isset($this->modifiers[$attribute_code]);
+ }
+
+ /**
+ * Apply modifier to config
+ *
+ * @param array $config
+ * @return array
+ */
+ private function applyModifier(array $config): array
+ {
+ $modifiedConfig = $this->modifiers[$config['attribute_code']];
+ foreach (array_keys($config) as $key) {
+ if (isset($modifiedConfig[$key])) {
+ $config[$key] = $modifiedConfig[$key];
+ }
+ }
+ return $config;
+ }
+}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 72ab5a265d808..66298d23389fb 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -12,7 +12,7 @@
* @api
* @deprecated 100.2.0 in favour of UI component implementation
* @method string getRowClickCallback() getRowClickCallback()
- * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback() setRowClickCallback(string $value)
+ * @method \Magento\Backend\Block\Widget\Grid setRowClickCallback(string $value)
* @SuppressWarnings(PHPMD.TooManyFields)
* @since 100.0.2
*/
@@ -150,7 +150,10 @@ public function __construct(
}
/**
+ * Internal constructor, that is called from real constructor
+ *
* @return void
+ *
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
protected function _construct()
@@ -709,6 +712,7 @@ public function getGridUrl()
/**
* Grid url getter
+ *
* Version of getGridUrl() but with parameters
*
* @param array $params url parameters
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 88d1560026cbd..1d8d658267020 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
@@ -26,7 +26,6 @@ public function getValue($index = null)
{
if ($index) {
if ($data = $this->getData('value', 'orig_' . $index)) {
- // date('Y-m-d', strtotime($data));
return $data;
}
return null;
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
index d49ad2941146b..a0907726ccc46 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Theme.php
@@ -9,6 +9,9 @@
*/
namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
+/**
+ * Theme grid filter
+ */
class Theme extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
{
/**
@@ -54,7 +57,8 @@ public function getHtml()
}
/**
- * Retrieve options setted in column.
+ * Retrieve options set in column.
+ *
* Or load if options was not set.
*
* @return array
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 b8a2e283b29a0..623a75015eb2f 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
@@ -28,6 +28,8 @@ abstract class AbstractRenderer extends \Magento\Backend\Block\AbstractBlock imp
protected $_column;
/**
+ * Set column for renderer.
+ *
* @param Column $column
* @return $this
*/
@@ -38,6 +40,8 @@ public function setColumn($column)
}
/**
+ * Returns row associated with the renderer.
+ *
* @return Column
*/
public function getColumn()
@@ -48,7 +52,7 @@ public function getColumn()
/**
* Renders grid column
*
- * @param Object $row
+ * @param DataObject $row
* @return string
*/
public function render(DataObject $row)
@@ -66,7 +70,7 @@ public function render(DataObject $row)
/**
* Render column for export
*
- * @param Object $row
+ * @param DataObject $row
* @return string
*/
public function renderExport(DataObject $row)
@@ -75,7 +79,9 @@ public function renderExport(DataObject $row)
}
/**
- * @param Object $row
+ * Returns value of the row.
+ *
+ * @param DataObject $row
* @return mixed
*/
protected function _getValue(DataObject $row)
@@ -92,7 +98,9 @@ protected function _getValue(DataObject $row)
}
/**
- * @param Object $row
+ * Get pre-rendered input element.
+ *
+ * @param DataObject $row
* @return string
*/
public function _getInputValueElement(DataObject $row)
@@ -108,7 +116,9 @@ public function _getInputValueElement(DataObject $row)
}
/**
- * @param Object $row
+ * Get input value by row.
+ *
+ * @param DataObject $row
* @return mixed
*/
protected function _getInputValue(DataObject $row)
@@ -117,6 +127,8 @@ protected function _getInputValue(DataObject $row)
}
/**
+ * Renders header of the column,
+ *
* @return string
*/
public function renderHeader()
@@ -148,6 +160,8 @@ public function renderHeader()
}
/**
+ * Render HTML properties.
+ *
* @return string
*/
public function renderProperty()
@@ -172,6 +186,8 @@ public function renderProperty()
}
/**
+ * Returns HTML for CSS.
+ *
* @return string
*/
public function renderCss()
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 b3f467ce37c88..03566bce3fc34 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
@@ -82,7 +82,7 @@ public function render(\Magento\Framework\DataObject $row)
{
if ($data = (string)$this->_getValue($row)) {
$currency_code = $this->_getCurrencyCode($row);
- $data = floatval($data) * $this->_getRate($row);
+ $data = (float)$data * $this->_getRate($row);
$sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
$data = sprintf("%f", $data);
$data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -118,10 +118,10 @@ protected function _getCurrencyCode($row)
protected function _getRate($row)
{
if ($rate = $this->getColumn()->getRate()) {
- return floatval($rate);
+ return (float)$rate;
}
if ($rate = $row->getData($this->getColumn()->getRateField())) {
- return floatval($rate);
+ return (float)$rate;
}
return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
index e4300c63485f5..9da23af83f036 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
return $data;
}
- $data = floatval($data) * $this->_getRate($row);
+ $data = (float)$data * $this->_getRate($row);
$data = sprintf("%f", $data);
$data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
return $data;
@@ -94,10 +94,10 @@ protected function _getCurrencyCode($row)
protected function _getRate($row)
{
if ($rate = $this->getColumn()->getRate()) {
- return floatval($rate);
+ return (float)$rate;
}
if ($rate = $row->getData($this->getColumn()->getRateField())) {
- return floatval($rate);
+ return (float)$rate;
}
return 1;
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 3fa60faad45c8..9890a10a4ceb0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -7,6 +7,7 @@
namespace Magento\Backend\Block\Widget\Grid\Massaction;
use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
+use Magento\Framework\Data\Collection\AbstractDb;
use Magento\Framework\DataObject;
/**
@@ -52,7 +53,7 @@ public function __construct(
}
/**
- * @return void
+ * @inheritdoc
*/
protected function _construct()
{
@@ -217,6 +218,7 @@ public function getGridJsObjectName()
* Retrieve JSON string of selected checkboxes
*
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getSelectedJson()
{
@@ -231,6 +233,7 @@ public function getSelectedJson()
* Retrieve array of selected checkboxes
*
* @return string[]
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getSelected()
{
@@ -252,6 +255,8 @@ public function getApplyButtonHtml()
}
/**
+ * Get mass action javascript code.
+ *
* @return string
*/
public function getJavaScript()
@@ -268,6 +273,8 @@ public function getJavaScript()
}
/**
+ * Get grid ids in JSON format.
+ *
* @return string
*/
public function getGridIdsJson()
@@ -277,13 +284,18 @@ public function getGridIdsJson()
}
/** @var \Magento\Framework\Data\Collection $allIdsCollection */
$allIdsCollection = clone $this->getParentBlock()->getCollection();
-
+
if ($this->getMassactionIdField()) {
$massActionIdField = $this->getMassactionIdField();
} else {
$massActionIdField = $this->getParentBlock()->getMassactionIdField();
}
-
+
+ if ($allIdsCollection instanceof AbstractDb) {
+ $allIdsCollection->getSelect()->limit();
+ $allIdsCollection->clear();
+ }
+
$gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
if (!empty($gridIds)) {
return join(",", $gridIds);
@@ -292,6 +304,8 @@ public function getGridIdsJson()
}
/**
+ * Get Html id.
+ *
* @return string
*/
public function getHtmlId()
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
index d59d3858179e0..8e0fce2b16cc9 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -274,13 +274,13 @@ public function getGridIdsJson()
/** @var \Magento\Framework\Data\Collection $allIdsCollection */
$allIdsCollection = clone $this->getParentBlock()->getCollection();
-
+
if ($this->getMassactionIdField()) {
$massActionIdField = $this->getMassactionIdField();
} else {
$massActionIdField = $this->getParentBlock()->getMassactionIdField();
}
-
+
$gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
if (!empty($gridIds)) {
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 7f146e19e8c6e..c7c1f93e8ca73 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -8,6 +8,8 @@
use Magento\Backend\Block\Widget\Tab\TabInterface;
/**
+ * Tabs widget
+ *
* @api
* @SuppressWarnings(PHPMD.NumberOfChildren)
* @since 100.0.2
@@ -117,6 +119,7 @@ public function addTab($tabId, $tab)
if (empty($tabId)) {
throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
}
+
if (is_array($tab)) {
$this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);
} elseif ($tab instanceof \Magento\Framework\DataObject) {
@@ -126,6 +129,7 @@ public function addTab($tabId, $tab)
}
} elseif (is_string($tab)) {
$this->_addTabByName($tab, $tabId);
+
if (!$this->_tabs[$tabId] instanceof TabInterface) {
unset($this->_tabs[$tabId]);
return $this;
@@ -133,6 +137,7 @@ public function addTab($tabId, $tab)
} else {
throw new \Exception(__('Please correct the tab configuration and try again.'));
}
+
if ($this->_tabs[$tabId]->getUrl() === null) {
$this->_tabs[$tabId]->setUrl('#');
}
@@ -143,10 +148,7 @@ public function addTab($tabId, $tab)
$this->_tabs[$tabId]->setId($tabId);
$this->_tabs[$tabId]->setTabId($tabId);
-
- if ($this->_activeTab === null) {
- $this->_activeTab = $tabId;
- }
+
if (true === $this->_tabs[$tabId]->getActive()) {
$this->setActiveTab($tabId);
}
@@ -178,6 +180,8 @@ protected function _addTabByName($tab, $tabId)
}
/**
+ * Get active tab id
+ *
* @return string
*/
public function getActiveTabId()
@@ -187,6 +191,7 @@ public function getActiveTabId()
/**
* Set Active Tab
+ *
* Tab has to be not hidden and can show
*
* @param string $tabId
@@ -231,38 +236,117 @@ protected function _setActiveTab($tabId)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
protected function _beforeToHtml()
{
+ $this->_tabs = $this->reorderTabs();
+
if ($activeTab = $this->getRequest()->getParam('active_tab')) {
$this->setActiveTab($activeTab);
} elseif ($activeTabId = $this->_authSession->getActiveTabId()) {
$this->_setActiveTab($activeTabId);
}
- $_new = [];
+ if ($this->_activeTab === null && !empty($this->_tabs)) {
+ /** @var TabInterface $tab */
+ $this->_activeTab = (reset($this->_tabs))->getId();
+ }
+
+ $this->assign('tabs', $this->_tabs);
+ return parent::_beforeToHtml();
+ }
+
+ /**
+ * Reorder the tabs.
+ *
+ * @return array
+ */
+ private function reorderTabs()
+ {
+ $orderByIdentity = [];
+ $orderByPosition = [];
+ $position = 100;
+
+ /**
+ * Set the initial positions for each tab.
+ *
+ * @var string $key
+ * @var TabInterface $tab
+ */
foreach ($this->_tabs as $key => $tab) {
- foreach ($this->_tabs as $k => $t) {
- if ($t->getAfter() == $key) {
- $_new[$key] = $tab;
- $_new[$k] = $t;
- } else {
- if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($this->_tabs))) {
- $_new[$key] = $tab;
- }
- }
- }
+ $tab->setPosition($position);
+
+ $orderByIdentity[$key] = $tab;
+ $orderByPosition[$position] = $tab;
+
+ $position += 100;
}
- $this->_tabs = $_new;
- unset($_new);
+ return $this->applyTabsCorrectOrder($orderByPosition, $orderByIdentity);
+ }
- $this->assign('tabs', $this->_tabs);
- return parent::_beforeToHtml();
+ /**
+ * Apply tabs order
+ *
+ * @param array $orderByPosition
+ * @param array $orderByIdentity
+ *
+ * @return array
+ */
+ private function applyTabsCorrectOrder(array $orderByPosition, array $orderByIdentity)
+ {
+ $positionFactor = 1;
+
+ /**
+ * Rearrange the positions by using the after tag for each tab.
+ *
+ * @var int $position
+ * @var TabInterface $tab
+ */
+ foreach ($orderByPosition as $position => $tab) {
+ if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($orderByIdentity))) {
+ $positionFactor = 1;
+ continue;
+ }
+
+ $grandPosition = $orderByIdentity[$tab->getAfter()]->getPosition();
+ $newPosition = $grandPosition + $positionFactor;
+
+ unset($orderByPosition[$position]);
+ $orderByPosition[$newPosition] = $tab;
+ $tab->setPosition($newPosition);
+
+ $positionFactor++;
+ }
+
+ return $this->finalTabsSortOrder($orderByPosition);
}
/**
+ * Apply the last sort order to tabs.
+ *
+ * @param array $orderByPosition
+ *
+ * @return array
+ */
+ private function finalTabsSortOrder(array $orderByPosition)
+ {
+ ksort($orderByPosition);
+
+ $ordered = [];
+
+ /** @var TabInterface $tab */
+ foreach ($orderByPosition as $tab) {
+ $ordered[$tab->getId()] = $tab;
+ }
+
+ return $ordered;
+ }
+
+ /**
+ * Get js object name
+ *
* @return string
*/
public function getJsObjectName()
@@ -271,6 +355,8 @@ public function getJsObjectName()
}
/**
+ * Get tabs ids
+ *
* @return string[]
*/
public function getTabsIds()
@@ -283,6 +369,8 @@ public function getTabsIds()
}
/**
+ * Get tab id
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @param bool $withPrefix
* @return string
@@ -296,6 +384,8 @@ public function getTabId($tab, $withPrefix = true)
}
/**
+ * CVan show tab
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return bool
*/
@@ -308,6 +398,8 @@ public function canShowTab($tab)
}
/**
+ * Get tab is hidden
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return bool
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
@@ -321,6 +413,8 @@ public function getTabIsHidden($tab)
}
/**
+ * Get tab url
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return string
*/
@@ -339,6 +433,8 @@ public function getTabUrl($tab)
}
/**
+ * Get tab title
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return string
*/
@@ -351,6 +447,8 @@ public function getTabTitle($tab)
}
/**
+ * Get tab class
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return string
*/
@@ -366,6 +464,8 @@ public function getTabClass($tab)
}
/**
+ * Get tab label
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return string
*/
@@ -378,6 +478,8 @@ public function getTabLabel($tab)
}
/**
+ * Get tab content
+ *
* @param \Magento\Framework\DataObject|TabInterface $tab
* @return string
*/
@@ -393,7 +495,8 @@ public function getTabContent($tab)
}
/**
- * Mark tabs as dependant of each other
+ * Mark tabs as dependent of each other
+ *
* Arbitrary number of tabs can be specified, but at least two
*
* @param string $tabOneId
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
index 70b01046f6afe..11da740c46606 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php
@@ -11,13 +11,15 @@
use Symfony\Component\Console\Input\InputOption;
/**
+ * Abstract cache command
+ *
* @api
* @since 100.0.2
*/
abstract class AbstractCacheCommand extends Command
{
/**
- * Input option bootsrap
+ * Input option bootstrap
*/
const INPUT_KEY_BOOTSTRAP = 'bootstrap';
@@ -40,7 +42,7 @@ public function __construct(Manager $cacheManager)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
protected function configure()
{
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
index ad4546097768a..23731e29f0df4 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
@@ -6,7 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Auth;
-class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class DeniedJson extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGetActionInterface
{
/**
* @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
index e1ea57f63035e..1de77c810f316 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php
@@ -6,11 +6,14 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Auth;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
+
/**
* @api
* @since 100.0.2
*/
-class Login extends \Magento\Backend\Controller\Adminhtml\Auth
+class Login extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost
{
/**
* @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
index 41e32c929287a..d7ad080395e29 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php
@@ -6,7 +6,10 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Auth;
-class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
+
+class Logout extends \Magento\Backend\Controller\Adminhtml\Auth implements HttpGet, HttpPost
{
/**
* Administrator logout action
@@ -16,7 +19,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
public function execute()
{
$this->_auth->logout();
- $this->messageManager->addSuccess(__('You have logged out.'));
+ $this->messageManager->addSuccessMessage(__('You have logged out.'));
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
index 7a926b1c09c3e..79bc19256d270 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
@@ -6,10 +6,11 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Cache;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Controller\ResultFactory;
-class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
+class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
{
/**
* Authorization level of a basic admin session
@@ -28,11 +29,11 @@ public function execute()
try {
$this->_objectManager->create(\Magento\Catalog\Model\Product\Image::class)->clearCache();
$this->_eventManager->dispatch('clean_catalog_images_cache_after');
- $this->messageManager->addSuccess(__('The image cache was cleaned.'));
+ $this->messageManager->addSuccessMessage(__('The image cache was cleaned.'));
} catch (LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
+ $this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the image cache.'));
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
index 72f23ab65cf8a..36aca1afcc480 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
@@ -6,10 +6,11 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Cache;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Controller\ResultFactory;
-class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
+class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
{
/**
* Authorization level of a basic admin session
@@ -28,11 +29,12 @@ public function execute()
try {
$this->_objectManager->get(\Magento\Framework\View\Asset\MergeService::class)->cleanMergedJsCss();
$this->_eventManager->dispatch('clean_media_cache_after');
- $this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
+ $this->messageManager->addSuccessMessage(__('The JavaScript/CSS cache has been cleaned.'));
} catch (LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
+ $this->messageManager
+ ->addExceptionMessage($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
index 27ae2fc31e150..a3a26c5cf6242 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php
@@ -6,9 +6,10 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Cache;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
use Magento\Framework\Controller\ResultFactory;
-class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache
+class CleanStaticFiles extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
{
/**
* Authorization level of a basic admin session
@@ -26,7 +27,7 @@ public function execute()
{
$this->_objectManager->get(\Magento\Framework\App\State\CleanupFiles::class)->clearMaterializedViewFiles();
$this->_eventManager->dispatch('clean_static_files_cache_after');
- $this->messageManager->addSuccess(__('The static files cache has been cleaned.'));
+ $this->messageManager->addSuccessMessage(__('The static files cache has been cleaned.'));
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
index ca89ea58fa6f3..daf424d14c55b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php
@@ -6,7 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Cache;
-class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class FlushAll extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
{
/**
* Authorization level of a basic admin session
@@ -27,7 +29,7 @@ public function execute()
foreach ($this->_cacheFrontendPool as $cacheFrontend) {
$cacheFrontend->getBackend()->clean();
}
- $this->messageManager->addSuccess(__("You flushed the cache storage."));
+ $this->messageManager->addSuccessMessage(__("You flushed the cache storage."));
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
return $resultRedirect->setPath('adminhtml/*');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
index f0fed159e0f22..f3474bf43872b 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php
@@ -6,7 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Cache;
-class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class FlushSystem extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
{
/**
* Authorization level of a basic admin session
@@ -27,7 +29,7 @@ public function execute()
$cacheFrontend->clean();
}
$this->_eventManager->dispatch('adminhtml_cache_flush_system');
- $this->messageManager->addSuccess(__("The Magento cache storage has been flushed."));
+ $this->messageManager->addSuccessMessage(__("The Magento cache storage has been flushed."));
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();
return $resultRedirect->setPath('adminhtml/*');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
index 05bd309ca620e..f1e908bb842ee 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/Index.php
@@ -6,7 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Cache;
-class Index extends \Magento\Backend\Controller\Adminhtml\Cache
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\Cache implements HttpGetActionInterface
{
/**
* Display cache management grid
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
index 2bfa937b06b77..03b88ca1d3f47 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
@@ -67,12 +67,12 @@ private function disableCache()
}
if ($updatedTypes > 0) {
$this->_cacheState->persist();
- $this->messageManager->addSuccess(__("%1 cache type(s) disabled.", $updatedTypes));
+ $this->messageManager->addSuccessMessage(__("%1 cache type(s) disabled.", $updatedTypes));
}
} catch (LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __('An error occurred while disabling cache.'));
+ $this->messageManager->addExceptionMessage($e, __('An error occurred while disabling cache.'));
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
index 113e0f2d8961b..1b98a00d4bf35 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
@@ -66,12 +66,12 @@ private function enableCache()
}
if ($updatedTypes > 0) {
$this->_cacheState->persist();
- $this->messageManager->addSuccess(__("%1 cache type(s) enabled.", $updatedTypes));
+ $this->messageManager->addSuccessMessage(__("%1 cache type(s) enabled.", $updatedTypes));
}
} catch (LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __('An error occurred while enabling cache.'));
+ $this->messageManager->addExceptionMessage($e, __('An error occurred while enabling cache.'));
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
index 3843b030afb3d..bde211debcf72 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
@@ -37,12 +37,12 @@ public function execute()
$updatedTypes++;
}
if ($updatedTypes > 0) {
- $this->messageManager->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
+ $this->messageManager->addSuccessMessage(__("%1 cache type(s) refreshed.", $updatedTypes));
}
} catch (LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __('An error occurred while refreshing cache.'));
+ $this->messageManager->addExceptionMessage($e, __('An error occurred while refreshing cache.'));
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
index d8c52f6c50bba..decca6837fa00 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Index.php
@@ -6,7 +6,11 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
-class Index extends \Magento\Backend\Controller\Adminhtml\Dashboard
+use Magento\Backend\Controller\Adminhtml\Dashboard as DashboardAction;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Index extends DashboardAction implements HttpGetActionInterface, HttpPostActionInterface
{
/**
* @var \Magento\Framework\View\Result\PageFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
index 3907f4a4f71a2..0de1111ffa722 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
@@ -6,12 +6,17 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
-class ProductsViewed extends AjaxBlock
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Get most viewed products controller.
+ */
+class ProductsViewed extends AjaxBlock implements HttpGetActionInterface
{
/**
* Gets most viewed products list
*
- * @return \Magento\Backend\Model\View\Result\Page
+ * @return \Magento\Framework\Controller\Result\Raw
*/
public function execute()
{
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index f831fa67f4bb0..c709859adb190 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -6,7 +6,13 @@
namespace Magento\Backend\Controller\Adminhtml\Dashboard;
-class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Reports\Controller\Adminhtml\Report\Statistics;
+
+/**
+ * Refresh Dashboard statistics action.
+ */
+class RefreshStatistics extends Statistics implements HttpPostActionInterface
{
/**
* @param \Magento\Backend\App\Action\Context $context
@@ -25,6 +31,8 @@ public function __construct(
}
/**
+ * Refresh statistics.
+ *
* @return \Magento\Backend\Model\View\Result\Redirect
*/
public function execute()
@@ -34,9 +42,9 @@ public function execute()
foreach ($collectionsNames as $collectionName) {
$this->_objectManager->create($collectionName)->aggregate();
}
- $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
+ $this->messageManager->addSuccessMessage(__('We updated lifetime statistic.'));
} catch (\Exception $e) {
- $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
+ $this->messageManager->addErrorMessage(__('We can\'t refresh lifetime statistics.'));
$this->logger->critical($e);
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
index 9ca4021d08356..37f3064aeaa38 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
@@ -6,11 +6,15 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Index;
+use Magento\Backend\Controller\Adminhtml\Index as IndexAction;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+
/**
* @api
* @since 100.0.2
*/
-class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
+class GlobalSearch extends IndexAction implements HttpGetActionInterface, HttpPostActionInterface
{
/**
* @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
index a5c71fb2dbc5c..afb1b4573271d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/Index.php
@@ -6,7 +6,10 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Index;
-class Index extends \Magento\Backend\Controller\Adminhtml\Index
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGet;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPost;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\Index implements HttpGet, HttpPost
{
/**
* Admin area entry point
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
index ce59d2fd48e5a..e84987d8e1d70 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php
@@ -6,6 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\Noroute;
+/**
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
class Index extends \Magento\Backend\App\Action
{
/**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
index 54771bfdc1a7d..648f1be86f56c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Index.php
@@ -6,7 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\System\Account;
-class Index extends \Magento\Backend\Controller\Adminhtml\System\Account
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\System\Account implements HttpGetActionInterface
{
/**
* @var \Magento\Framework\View\Result\PageFactory
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 1b10c151a9d21..d95b0541c2c76 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -76,12 +76,12 @@ public function execute()
$errors = $user->validate();
if ($errors !== true && !empty($errors)) {
foreach ($errors as $error) {
- $this->messageManager->addError($error);
+ $this->messageManager->addErrorMessage($error);
}
} else {
$user->save();
$user->sendNotificationEmailsIfRequired();
- $this->messageManager->addSuccess(__('You saved the account.'));
+ $this->messageManager->addSuccessMessage(__('You saved the account.'));
}
} catch (UserLockedException $e) {
$this->_auth->logout();
@@ -91,12 +91,12 @@ public function execute()
} catch (ValidatorException $e) {
$this->messageManager->addMessages($e->getMessages());
if ($e->getMessage()) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
}
} catch (LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addError(__('An error occurred while saving account.'));
+ $this->messageManager->addErrorMessage(__('An error occurred while saving account.'));
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
index 76402169f269e..21f28188cf874 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
@@ -19,11 +19,11 @@ public function execute()
try {
$design->delete();
- $this->messageManager->addSuccess(__('You deleted the design change.'));
+ $this->messageManager->addSuccessMessage(__('You deleted the design change.'));
} catch (\Magento\Framework\Exception\LocalizedException $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
} catch (\Exception $e) {
- $this->messageManager->addException($e, __("You can't delete the design change."));
+ $this->messageManager->addExceptionMessage($e, __("You can't delete the design change."));
}
}
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
index 30b26f2294193..c6a05b5a71d0c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Index.php
@@ -6,7 +6,9 @@
*/
namespace Magento\Backend\Controller\Adminhtml\System\Design;
-class Index extends \Magento\Backend\Controller\Adminhtml\System\Design
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpGetActionInterface
{
/**
* @return \Magento\Backend\Model\View\Result\Page
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
index 1f478604ced7d..25cfb61d658c3 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
@@ -6,7 +6,12 @@
*/
namespace Magento\Backend\Controller\Adminhtml\System\Design;
-class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Save design action.
+ */
+class Save extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpPostActionInterface
{
/**
* Filtering posted data. Converting localized data if needed
@@ -26,6 +31,8 @@ protected function _filterPostData($data)
}
/**
+ * Save design action.
+ *
* @return \Magento\Backend\Model\View\Result\Redirect
*/
public function execute()
@@ -50,14 +57,14 @@ public function execute()
try {
$design->save();
$this->_eventManager->dispatch('theme_save_after');
- $this->messageManager->addSuccess(__('You saved the design change.'));
+ $this->messageManager->addSuccessMessage(__('You saved the design change.'));
} catch (\Exception $e) {
- $this->messageManager->addError($e->getMessage());
+ $this->messageManager->addErrorMessage($e->getMessage());
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
- return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
+ return $resultRedirect->setPath('*/*/edit', ['id' => $design->getId()]);
}
}
- return $resultRedirect->setPath('adminhtml/*/');
+ return $resultRedirect->setPath('*/*/');
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 4fbae6abb423a..a9be14b77b29c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -14,6 +14,7 @@
* Store controller
*
* @author Magento Core Team
+
+
+
+
+
+
+
+
+
+
+
+ 404 Error
Page not found.
","404 Error
Page not found.
" "Community Edition","Community Edition" "Default Theme","Default Theme" -"If no value is specified, the system default is used. The system default may be modified by third party extensions.","If no value is specified, the system default is used. The system default may be modified by third party extensions." +"If no value is specified, the system default is used. The system default may be modified by third-party extensions.","If no value is specified, the system default is used. The system default may be modified by third-party extensions." "Applied Theme","Applied Theme" "Design Rule","Design Rule" "User Agent Rules","User Agent Rules" diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml index 805e9783f3f18..52d5dd6d114ee 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml @@ -43,7 +43,7 @@ data-validate="{required:true}" value="" placeholder="" - autocomplete="new-password" + autocomplete="off" /> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml index 1e14dd837634a..4d9ba6a8c4bad 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml @@ -13,8 +13,9 @@ data-mage-init='{ "Magento_Backend/js/media-uploader" : { "maxFileSize": getFileSizeService()->getMaxFileSize() ?>, - "maxWidth": , - "maxHeight": + "maxWidth": getImageUploadMaxWidth() ?>, + "maxHeight": getImageUploadMaxHeight() ?>, + "isResizeEnabled": getImageUploadConfigData()->getIsResizeEnabled() ?> } }' > 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 8feccc9cf1b8f..f952001f5e2ff 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml @@ -17,7 +17,7 @@ class="logo">
+
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
index 9c95b79196e9d..ab01565d7f1e5 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -24,6 +24,7 @@ define([
scriptLoaded: false,
braintree: null,
selectedCardType: null,
+ checkout: null,
imports: {
onActiveChange: 'active'
}
@@ -147,6 +148,12 @@ define([
this.disableEventListeners();
+ if (self.checkout) {
+ self.checkout.teardown(function () {
+ self.checkout = null;
+ });
+ }
+
self.braintree.setup(self.clientToken, 'custom', {
id: self.selector,
hostedFields: self.getHostedFields(),
@@ -154,7 +161,8 @@ define([
/**
* Triggered when sdk was loaded
*/
- onReady: function () {
+ onReady: function (checkout) {
+ self.checkout = checkout;
$('body').trigger('processStop');
self.enableEventListeners();
},
diff --git a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
index ab294f8e797b7..c4152e1c3ebf9 100644
--- a/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml
@@ -35,6 +35,9 @@
+ escapeHtml(__('Additional Cache Management')); ?> +
hasAccessToFlushCatalogImages()): ?> -- escapeHtml(__('Additional Cache Management')); ?> -
+ alt="escapeHtml(__('Pay with PayPal')) ?>"
+ title="escapeHtml(__('Pay with PayPal')) ?>"/>
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
index ca9d3686958b4..eaebd8492b0a1 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -103,6 +103,12 @@ define([
}
});
+ quote.shippingAddress.subscribe(function () {
+ if (self.isActive()) {
+ self.reInitPayPal();
+ }
+ });
+
// for each component initialization need update property
this.isReviewRequired(false);
this.initClientConfig();
@@ -204,7 +210,9 @@ define([
beforePlaceOrder: function (data) {
this.setPaymentMethodNonce(data.nonce);
- if (quote.billingAddress() === null && typeof data.details.billingAddress !== 'undefined') {
+ if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
+ typeof data.details.billingAddress !== 'undefined'
+ ) {
this.setBillingAddress(data.details, data.details.billingAddress);
}
@@ -228,6 +236,7 @@ define([
this.disableButton();
this.clientConfig.paypal.amount = this.grandTotalAmount;
+ this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
Braintree.setConfig(this.clientConfig);
Braintree.setup();
@@ -249,6 +258,14 @@ define([
return window.checkoutConfig.payment[this.getCode()].isAllowShippingAddressOverride;
},
+ /**
+ * Is billing address required from PayPal side
+ * @returns {Boolean}
+ */
+ isRequiredBillingAddress: function () {
+ return window.checkoutConfig.payment[this.getCode()].isRequiredBillingAddress;
+ },
+
/**
* Get configuration for PayPal
* @returns {Object}
@@ -403,14 +420,16 @@ define([
* Triggers when customer click "Continue to PayPal" button
*/
payWithPayPal: function () {
- if (additionalValidators.validate()) {
- try {
- Braintree.checkout.paypal.initAuthFlow();
- } catch (e) {
- this.messageContainer.addErrorMessage({
- message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
- });
- }
+ if (!additionalValidators.validate()) {
+ return;
+ }
+
+ try {
+ Braintree.checkout.paypal.initAuthFlow();
+ } catch (e) {
+ this.messageContainer.addErrorMessage({
+ message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
+ });
}
},
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
index f5c8c15c8f3ba..e1f6a1b4c25ce 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
@@ -12,7 +12,7 @@
data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />