+Community Maintainers
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+
+
+
+Top Contributors
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
+
+
+
Labels applied by the Magento team
| Label | Description |
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 3d474cea45432..e77c6d432c816 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -14,12 +14,12 @@
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
if (PHP_SAPI == 'cli') {
echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
- 'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
+ 'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
} else {
echo <<
Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
-
+
Magento System Requirements .
HTML;
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
index 6c0dfd1db7d16..94c7d955f592b 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
@@ -39,6 +39,6 @@ public function execute()
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
}
}
- $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+ $this->_redirect('adminhtml/*/');
}
}
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index 59a3845cbd4b7..c0c6be46ce769 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-admin-notification",
"description": "N/A",
"require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "php": "~7.0.13|~7.1.0",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-media-storage": "100.2.*",
@@ -11,7 +11,7 @@
"lib-libxml": "*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index 79e6e2d368736..a3d6e36e66a0f 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-advanced-pricing-import-export",
"description": "N/A",
"require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "php": "~7.0.13|~7.1.0",
"magento/module-catalog": "102.0.*",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-eav": "101.0.*",
@@ -13,7 +13,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
index c4118792255cd..34f2b7d53d9be 100644
--- a/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
+++ b/app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php
@@ -5,13 +5,35 @@
*/
namespace Magento\Analytics\Block\Adminhtml\System\Config;
+use Magento\Framework\App\ObjectManager;
+
/**
* Provides label with default Time Zone
*/
class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
{
/**
- * Add default time zone to comment
+ * @var \Magento\Framework\Locale\ResolverInterface
+ */
+ private $localeResolver;
+
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param array $data
+ * @param \Magento\Framework\Locale\ResolverInterface|null $localeResolver
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ array $data = [],
+ \Magento\Framework\Locale\ResolverInterface $localeResolver = null
+ ) {
+ $this->localeResolver = $localeResolver ?:
+ ObjectManager::getInstance()->get(\Magento\Framework\Locale\ResolverInterface::class);
+ parent::__construct($context, $data);
+ }
+
+ /**
+ * Add current time zone to comment, properly translated according to locale
*
* @param \Magento\Framework\Data\Form\Element\AbstractElement $element
* @return string
@@ -19,7 +41,9 @@ class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
{
$timeZoneCode = $this->_localeDate->getConfigTimezone();
- $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)->getDisplayName();
+ $locale = $this->localeResolver->getLocale();
+ $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)
+ ->getDisplayName(false, \IntlTimeZone::DISPLAY_LONG, $locale);
$element->setData(
'comment',
sprintf("%s (%s)", $getLongTimeZoneName, $timeZoneCode)
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index 349e5f3c08c4c..2e9b4bf158321 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-analytics",
"description": "N/A",
"require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "php": "~7.0.13|~7.1.0",
"magento/module-backend": "100.2.*",
"magento/module-config": "101.0.*",
"magento/module-integration": "100.2.*",
@@ -10,7 +10,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index c0b0f9c6b13df..22483b7961841 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-authorization",
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "php": "~7.0.13|~7.1.0",
"magento/module-backend": "100.2.*",
"magento/framework": "101.0.*"
},
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 0f10fd633cb5b..de567a8895f7e 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -5,10 +5,9 @@
*/
namespace Magento\Authorizenet\Model;
-use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\App\ObjectManager;
use Magento\Payment\Model\Method\ConfigInterface;
use Magento\Payment\Model\Method\TransparentInterface;
-use Magento\Sales\Model\Order\Email\Sender\OrderSender;
/**
* Authorize.net DirectPost payment method model.
@@ -102,7 +101,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
protected $response;
/**
- * @var OrderSender
+ * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender
*/
protected $orderSender;
@@ -123,6 +122,16 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
*/
private $psrLogger;
+ /**
+ * @var \Magento\Sales\Api\PaymentFailuresInterface
+ */
+ private $paymentFailures;
+
+ /**
+ * @var \Magento\Sales\Model\Order
+ */
+ private $order;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -141,11 +150,12 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
- * @param OrderSender $orderSender
+ * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender
* @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
+ * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -162,7 +172,7 @@ public function __construct(
\Magento\Authorizenet\Model\Directpost\Request\Factory $requestFactory,
\Magento\Authorizenet\Model\Directpost\Response\Factory $responseFactory,
TransactionService $transactionService,
- ZendClientFactory $httpClientFactory,
+ \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
@@ -170,7 +180,8 @@ public function __construct(
\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = []
+ array $data = [],
+ \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
) {
$this->orderFactory = $orderFactory;
$this->storeManager = $storeManager;
@@ -179,6 +190,8 @@ public function __construct(
$this->orderSender = $orderSender;
$this->transactionRepository = $transactionRepository;
$this->_code = static::METHOD_CODE;
+ $this->paymentFailures = $paymentFailures ? : ObjectManager::getInstance()
+ ->get(\Magento\Sales\Api\PaymentFailuresInterface::class);
parent::__construct(
$context,
@@ -561,13 +574,10 @@ public function process(array $responseData)
$this->validateResponse();
$response = $this->getResponse();
- //operate with order
- $orderIncrementId = $response->getXInvoiceNum();
$responseText = $this->dataHelper->wrapGatewayError($response->getXResponseReasonText());
$isError = false;
- if ($orderIncrementId) {
- /* @var $order \Magento\Sales\Model\Order */
- $order = $this->orderFactory->create()->loadByIncrementId($orderIncrementId);
+ if ($this->getOrderIncrementId()) {
+ $order = $this->getOrderFromResponse();
//check payment method
$payment = $order->getPayment();
if (!$payment || $payment->getMethod() != $this->getCode()) {
@@ -632,9 +642,10 @@ public function checkResponseCode()
return true;
case self::RESPONSE_CODE_DECLINED:
case self::RESPONSE_CODE_ERROR:
- throw new \Magento\Framework\Exception\LocalizedException(
- $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText())
- );
+ $errorMessage = $this->dataHelper->wrapGatewayError($this->getResponse()->getXResponseReasonText());
+ $order = $this->getOrderFromResponse();
+ $this->paymentFailures->handle((int)$order->getQuoteId(), $errorMessage);
+ throw new \Magento\Framework\Exception\LocalizedException($errorMessage);
default:
throw new \Magento\Framework\Exception\LocalizedException(
__('There was a payment authorization error.')
@@ -988,12 +999,40 @@ protected function getTransactionResponse($transactionId)
private function getPsrLogger()
{
if (null === $this->psrLogger) {
- $this->psrLogger = \Magento\Framework\App\ObjectManager::getInstance()
+ $this->psrLogger = ObjectManager::getInstance()
->get(\Psr\Log\LoggerInterface::class);
}
return $this->psrLogger;
}
+ /**
+ * Fetch order by increment id from response.
+ *
+ * @return \Magento\Sales\Model\Order
+ */
+ private function getOrderFromResponse(): \Magento\Sales\Model\Order
+ {
+ if (!$this->order) {
+ $this->order = $this->orderFactory->create();
+
+ if ($incrementId = $this->getOrderIncrementId()) {
+ $this->order = $this->order->loadByIncrementId($incrementId);
+ }
+ }
+
+ return $this->order;
+ }
+
+ /**
+ * Fetch order increment id from response.
+ *
+ * @return string
+ */
+ private function getOrderIncrementId(): string
+ {
+ return $this->getResponse()->getXInvoiceNum();
+ }
+
/**
* Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal,
* but are also reported in the Merchant Interface as triggering this filter.
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
index dbb6ac8333c14..26d96b9bc2d90 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
@@ -5,6 +5,7 @@
*/
namespace Magento\Authorizenet\Test\Unit\Model;
+use Magento\Sales\Api\PaymentFailuresInterface;
use Magento\Framework\Simplexml\Element;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
use Magento\Authorizenet\Model\Directpost;
@@ -74,6 +75,14 @@ class DirectpostTest extends \PHPUnit\Framework\TestCase
*/
protected $requestFactory;
+ /**
+ * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $paymentFailures;
+
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
@@ -104,6 +113,12 @@ protected function setUp()
->setMethods(['getTransactionDetails'])
->getMock();
+ $this->paymentFailures = $this->getMockBuilder(
+ PaymentFailuresInterface::class
+ )
+ ->disableOriginalConstructor()
+ ->getMock();
+
$this->requestFactory = $this->getRequestFactoryMock();
$httpClientFactoryMock = $this->getHttpClientFactoryMock();
@@ -117,7 +132,8 @@ protected function setUp()
'responseFactory' => $this->responseFactoryMock,
'transactionRepository' => $this->transactionRepositoryMock,
'transactionService' => $this->transactionServiceMock,
- 'httpClientFactory' => $httpClientFactoryMock
+ 'httpClientFactory' => $httpClientFactoryMock,
+ 'paymentFailures' => $this->paymentFailures,
]
);
}
@@ -313,12 +329,16 @@ public function checkResponseCodeSuccessDataProvider()
}
/**
- * @param bool $responseCode
+ * Checks response failures behaviour.
+ *
+ * @param int $responseCode
+ * @param int $failuresHandlerCalls
+ * @return void
*
* @expectedException \Magento\Framework\Exception\LocalizedException
* @dataProvider checkResponseCodeFailureDataProvider
*/
- public function testCheckResponseCodeFailure($responseCode)
+ public function testCheckResponseCodeFailure(int $responseCode, int $failuresHandlerCalls)
{
$reasonText = 'reason text';
@@ -333,18 +353,35 @@ public function testCheckResponseCodeFailure($responseCode)
->with($reasonText)
->willReturn(__('Gateway error: %1', $reasonText));
+ $orderMock = $this->getMockBuilder(Order::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $orderMock->expects($this->exactly($failuresHandlerCalls))
+ ->method('getQuoteId')
+ ->willReturn(1);
+
+ $this->paymentFailures->expects($this->exactly($failuresHandlerCalls))
+ ->method('handle')
+ ->with(1);
+
+ $reflection = new \ReflectionClass($this->directpost);
+ $order = $reflection->getProperty('order');
+ $order->setAccessible(true);
+ $order->setValue($this->directpost, $orderMock);
+
$this->directpost->checkResponseCode();
}
/**
* @return array
*/
- public function checkResponseCodeFailureDataProvider()
+ public function checkResponseCodeFailureDataProvider(): array
{
return [
- ['responseCode' => Directpost::RESPONSE_CODE_DECLINED],
- ['responseCode' => Directpost::RESPONSE_CODE_ERROR],
- ['responseCode' => 999999]
+ ['responseCode' => Directpost::RESPONSE_CODE_DECLINED, 1],
+ ['responseCode' => Directpost::RESPONSE_CODE_ERROR, 1],
+ ['responseCode' => 999999, 0],
];
}
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index 1022bd47a5786..c389a1c6c4dfa 100644
--- a/app/code/Magento/Authorizenet/composer.json
+++ b/app/code/Magento/Authorizenet/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-authorizenet",
"description": "N/A",
"require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "php": "~7.0.13|~7.1.0",
"magento/module-sales": "101.0.*",
"magento/module-store": "100.2.*",
"magento/module-quote": "101.0.*",
diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
index e14358396aa70..82c36bf3a1fe4 100644
--- a/app/code/Magento/Backend/Block/Cache.php
+++ b/app/code/Magento/Backend/Block/Cache.php
@@ -22,24 +22,29 @@ protected function _construct()
$this->_headerText = __('Cache Storage Management');
parent::_construct();
$this->buttonList->remove('add');
- $this->buttonList->add(
- 'flush_magento',
- [
- 'label' => __('Flush Magento Cache'),
- 'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')',
- 'class' => 'primary flush-cache-magento'
- ]
- );
- $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
- $this->buttonList->add(
- 'flush_system',
- [
- 'label' => __('Flush Cache Storage'),
- 'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')',
- 'class' => 'flush-cache-storage'
- ]
- );
+ if ($this->_authorization->isAllowed('Magento_Backend::flush_magento_cache')) {
+ $this->buttonList->add(
+ 'flush_magento',
+ [
+ 'label' => __('Flush Magento Cache'),
+ 'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')',
+ 'class' => 'primary flush-cache-magento'
+ ]
+ );
+ }
+
+ if ($this->_authorization->isAllowed('Magento_Backend::flush_cache_storage')) {
+ $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
+ $this->buttonList->add(
+ 'flush_system',
+ [
+ 'label' => __('Flush Cache Storage'),
+ 'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')',
+ 'class' => 'flush-cache-storage'
+ ]
+ );
+ }
}
/**
diff --git a/app/code/Magento/Backend/Block/Cache/Permissions.php b/app/code/Magento/Backend/Block/Cache/Permissions.php
new file mode 100644
index 0000000000000..272a603145f09
--- /dev/null
+++ b/app/code/Magento/Backend/Block/Cache/Permissions.php
@@ -0,0 +1,62 @@
+authorization = $authorization;
+ }
+
+ /**
+ * @return bool
+ */
+ public function hasAccessToFlushCatalogImages()
+ {
+ return $this->authorization->isAllowed('Magento_Backend::flush_catalog_images');
+ }
+ /**
+ * @return bool
+ */
+ public function hasAccessToFlushJsCss()
+ {
+ return $this->authorization->isAllowed('Magento_Backend::flush_js_css');
+ }
+ /**
+ * @return bool
+ */
+ public function hasAccessToFlushStaticFiles()
+ {
+ return $this->authorization->isAllowed('Magento_Backend::flush_static_files');
+ }
+ /**
+ * @return bool
+ */
+ public function hasAccessToAdditionalActions()
+ {
+ return ($this->hasAccessToFlushCatalogImages()
+ || $this->hasAccessToFlushJsCss()
+ || $this->hasAccessToFlushStaticFiles());
+ }
+}
diff --git a/app/code/Magento/Backend/Block/GlobalSearch.php b/app/code/Magento/Backend/Block/GlobalSearch.php
index f4a46283808f4..b45eb84cdaee9 100644
--- a/app/code/Magento/Backend/Block/GlobalSearch.php
+++ b/app/code/Magento/Backend/Block/GlobalSearch.php
@@ -3,19 +3,61 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Backend\Block;
+use Magento\Backend\Model\GlobalSearch\SearchEntityFactory;
+use Magento\Backend\Model\GlobalSearch\SearchEntity;
+use Magento\Framework\App\ObjectManager;
+
/**
* @api
* @since 100.0.2
*/
class GlobalSearch extends \Magento\Backend\Block\Template
{
+ /**
+ * @var SearchEntityFactory
+ */
+ private $searchEntityFactory;
+
/**
* @var string
*/
protected $_template = 'Magento_Backend::system/search.phtml';
+ /**
+ * @var array
+ */
+ private $entityResources;
+
+ /**
+ * @var array
+ */
+ private $entityPaths;
+
+ /**
+ * @param Template\Context $context
+ * @param array $data
+ * @param array $entityResources
+ * @param array $entityPaths
+ * @param SearchEntityFactory|null $searchEntityFactory
+ */
+ public function __construct(
+ Template\Context $context,
+ array $data = [],
+ array $entityResources = [],
+ array $entityPaths = [],
+ SearchEntityFactory $searchEntityFactory = null
+ ) {
+ $this->entityResources = $entityResources;
+ $this->entityPaths = $entityPaths;
+ $this->searchEntityFactory = $searchEntityFactory ?: ObjectManager::getInstance()
+ ->get(SearchEntityFactory::class);
+
+ parent::__construct($context, $data);
+ }
+
/**
* Get components configuration
* @return array
@@ -31,7 +73,52 @@ public function getWidgetInitOptions()
'filterProperty' => 'name',
'preventClickPropagation' => false,
'minLength' => 2,
+ 'submitInputOnEnter' => false,
]
];
}
+
+ /**
+ * Get entities which are allowed to show.
+ *
+ * @return SearchEntity[]
+ */
+ public function getEntitiesToShow()
+ {
+ $allowedEntityTypes = [];
+ $entitiesToShow = [];
+
+ foreach ($this->entityResources as $entityType => $resource) {
+ if ($this->getAuthorization()->isAllowed($resource)) {
+ $allowedEntityTypes[] = $entityType;
+ }
+ }
+
+ foreach ($allowedEntityTypes as $entityType) {
+ $url = $this->getUrlEntityType($entityType);
+
+ $searchEntity = $this->searchEntityFactory->create();
+ $searchEntity->setId('searchPreview' . $entityType);
+ $searchEntity->setTitle('in ' . $entityType);
+ $searchEntity->setUrl($url);
+
+ $entitiesToShow[] = $searchEntity;
+ }
+
+ return $entitiesToShow;
+ }
+
+ /**
+ * Get url path by entity type.
+ *
+ * @param string $entityType
+ *
+ * @return string
+ */
+ private function getUrlEntityType(string $entityType)
+ {
+ $urlPath = $this->entityPaths[$entityType] ?? '';
+
+ return $this->getUrl($urlPath);
+ }
}
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
index 59657f38465d7..3d7154eb20f92 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
$this->getUrl('adminhtml/*/editGroup', ['group_id' => $row->getGroupId()]) .
'">' .
$this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
- '';
+ '
*
- * My\Module\ViewModel\Custom
+ * My\Module\ViewModel\Custom
*
*
*
+ * Your class object can then be accessed by doing $block->getViewModel()
+ *
* @api
* @SuppressWarnings(PHPMD.NumberOfChildren)
* @since 100.0.2
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 40a5d92c56b6f..632603d389d21 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -127,7 +127,7 @@ public function getHtml()
/**
* @param string|null $index
- * @return string
+ * @return array|string|int|float|null
*/
public function getEscapedValue($index = null)
{
@@ -138,6 +138,11 @@ public function getEscapedValue($index = null)
$this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)
);
}
+
+ if (is_string($value)) {
+ return $this->escapeHtml($value);
+ }
+
return $value;
}
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 96b3471db845e..a5e4a34389671 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
@@ -140,8 +140,8 @@ public function getHtml()
/**
* Return escaped value for calendar
*
- * @param string $index
- * @return string
+ * @param string|null $index
+ * @return array|string|int|float|null
*/
public function getEscapedValue($index = null)
{
@@ -150,6 +150,11 @@ public function getEscapedValue($index = null)
if ($value instanceof \DateTimeInterface) {
return $this->_localeDate->formatDateTime($value);
}
+
+ if (is_string($value)) {
+ return $this->escapeHtml($value);
+ }
+
return $value;
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
index 2cbe264c5f396..479a2b6b20293 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php
@@ -31,8 +31,7 @@ public function getCondition()
{
if ($this->getValue()) {
return $this->getColumn()->getValue();
- } else {
- return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
}
+ return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
}
}
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 320713f8b57c4..a611e91f32f00 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
@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
*/
protected function _getCheckboxHtml($value, $checked)
{
- $id = 'id_' . rand(0, 999);
+ $id = 'id_' . random_int(0, 999);
$html = '';
$html .= '
-
+
+
+
+
+
+
+
- Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN
- Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED
-
-
@@ -155,4 +152,20 @@
Magento\Backend\Block\Template
+
+
+
+ - Magento_Catalog::products
+ - Magento_Sales::sales_order
+ - Magento_Customer::manage
+ - Magento_Cms::page
+
+
+ - catalog/product/index/
+ - sales/order/index/
+ - customer/index/index
+ - cms/page/index/
+
+
+
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 27fd16cc920dc..1f642293214fe 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -120,7 +120,7 @@
Magento\Config\Model\Config\Source\Yesno
- Add Block Names to Hints
+ Add Block Class Type to Hints
Magento\Config\Model\Config\Source\Yesno
@@ -215,7 +215,7 @@
European Union Countries
Magento\Directory\Model\Config\Source\Country
-
+
Top destinations
Magento\Directory\Model\Config\Source\Country
@@ -409,7 +409,7 @@
Web
general
Magento_Config::web
-
+
Url Options
Add Store Code to Urls
@@ -419,7 +419,7 @@
Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).]]>
-
+
Auto-redirect to Base URL
Magento\Config\Model\Config\Source\Web\Redirect
I.e. redirect from http://example.com/store/ to http://www.example.com/store/
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index f9f44f547e25b..aa28a670b9205 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -461,3 +461,7 @@ Pagination,Pagination
"Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used.","Alternative text for the next pages link in the pagination menu. If empty, default arrow image is used."
"Anchor Text for Next","Anchor Text for Next"
"Theme Name","Theme Name"
+"In Products","In Products"
+"In Orders","In Orders"
+"In Customers","In Customers"
+"In Pages","In Pages"
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
index ab5ddc414b51f..4bbe70b6cdb92 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
@@ -11,7 +11,11 @@
+
+ Magento\Backend\Block\Cache\Permissions
+
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
index 3a3dbd99bfba9..4ef6d378cc4a4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
@@ -8,5 +8,7 @@
?>
getBugreportUrl()): ?>
-
+
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
index 84bbc4ea601ef..8e30afdf51f7f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -5,34 +5,39 @@
*/
// @codingStandardsIgnoreFile
+
+/** @var \Magento\Backend\Block\Cache\Permissions|null $permissions */
+$permissions = $block->getData('permissions');
?>
-
-
-
-
-
-
-
-
-
-
-
-
-
- isInProductionMode()):
- ?>
-
-
-
-
-
-
- getChildHtml() ?>
-
+ hasAccessToFlushCatalogImages()): ?>
+
+ escapeHtml(__('Additional Cache Management')); ?>
+
+
+
+ escapeHtml(__('Flush Catalog Images Cache')); ?>
+
+ escapeHtml(__('Pregenerated product images files')); ?>
+
+
+ hasAccessToFlushJsCss()): ?>
+
+
+ escapeHtml(__('Flush JavaScript/CSS Cache')); ?>
+
+ escapeHtml(__('Themes JavaScript and CSS files combined to one file')) ?>
+
+
+ isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()): ?>
+
+
+ escapeHtml(__('Flush Static Files Cache')); ?>
+
+ escapeHtml(__('Preprocessed view files and static files')); ?>
+
+
+ getChildHtml() ?>
+
+
+
+
+
+