attributeList;
}
+
+ /**
+ * Retrieve attribute set id for customer address.
+ *
+ * @return int
+ */
+ public function getAttributeSetId()
+ {
+ return parent::getAttributeSetId() ?: AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS;
+ }
}
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index ab0760e780a47..32b72023340b5 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -11,11 +11,46 @@
*/
namespace Magento\Eav\Model\Entity\Attribute\Frontend;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\Serialize\Serializer\Json as Serializer;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Eav\Model\Cache\Type as CacheType;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
+
/**
* @api
*/
abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\Frontend\FrontendInterface
{
+ /**
+ * Default cache tags values
+ * will be used if no values in the constructor provided
+ * @var array
+ */
+ private static $defaultCacheTags = [CacheType::CACHE_TAG, Attribute::CACHE_TAG];
+
+ /**
+ * @var CacheInterface
+ */
+ private $cache;
+
+ /**
+ * @var StoreResolverInterface
+ */
+ private $storeResolver;
+
+ /**
+ * @var Serializer
+ */
+ private $serializer;
+
+ /**
+ * @var array
+ */
+ private $cacheTags;
+
/**
* Reference to the attribute instance
*
@@ -24,17 +59,30 @@ abstract class AbstractFrontend implements \Magento\Eav\Model\Entity\Attribute\F
protected $_attribute;
/**
- * @var \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory
+ * @var BooleanFactory
*/
protected $_attrBooleanFactory;
/**
- * @param \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory
+ * @param BooleanFactory $attrBooleanFactory
+ * @param CacheInterface $cache
+ * @param StoreResolverInterface $storeResolver
+ * @param array $cacheTags
+ * @param Serializer $serializer
* @codeCoverageIgnore
*/
- public function __construct(\Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory $attrBooleanFactory)
- {
+ public function __construct(
+ BooleanFactory $attrBooleanFactory,
+ CacheInterface $cache = null,
+ StoreResolverInterface $storeResolver = null,
+ array $cacheTags = null,
+ Serializer $serializer = null
+ ) {
$this->_attrBooleanFactory = $attrBooleanFactory;
+ $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
+ $this->storeResolver = $storeResolver ?: ObjectManager::getInstance()->get(StoreResolverInterface::class);
+ $this->cacheTags = $cacheTags ?: self::$defaultCacheTags;
+ $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Serializer::class);
}
/**
@@ -249,7 +297,21 @@ public function getConfigField($fieldName)
*/
public function getSelectOptions()
{
- return $this->getAttribute()->getSource()->getAllOptions();
+ $cacheKey = 'attribute-navigation-option-' .
+ $this->getAttribute()->getAttributeCode() . '-' .
+ $this->storeResolver->getCurrentStoreId();
+ $optionString = $this->cache->load($cacheKey);
+ if (false === $optionString) {
+ $options = $this->getAttribute()->getSource()->getAllOptions();
+ $this->cache->save(
+ $this->serializer->serialize($options),
+ $cacheKey,
+ $this->cacheTags
+ );
+ } else {
+ $options = $this->serializer->unserialize($optionString);
+ }
+ return $options;
}
/**
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index e8f67879eba83..5dd00fb3bc4fb 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -6,6 +6,12 @@
namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Frontend;
use Magento\Eav\Model\Entity\Attribute\Frontend\DefaultFrontend;
+use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
+use Magento\Framework\Serialize\Serializer\Json as Serializer;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\Framework\App\CacheInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
class DefaultFrontendTest extends \PHPUnit_Framework_TestCase
{
@@ -15,18 +21,73 @@ class DefaultFrontendTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var BooleanFactory|\PHPUnit_Framework_MockObject_MockObject
*/
protected $booleanFactory;
+ /**
+ * @var Serializer|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $serializerMock;
+
+ /**
+ * @var StoreResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeResolverMock;
+
+ /**
+ * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $cacheMock;
+
+ /**
+ * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $attributeMock;
+
+ /**
+ * @var array
+ */
+ private $cacheTags;
+
+ /**
+ * @var AbstractSource|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $sourceMock;
+
protected function setUp()
{
- $this->booleanFactory = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory::class)
+ $this->cacheTags = ['tag1', 'tag2'];
+
+ $this->booleanFactory = $this->getMockBuilder(BooleanFactory::class)
->disableOriginalConstructor()
->getMock();
+ $this->serializerMock = $this->getMockBuilder(Serializer::class)
+ ->getMock();
+ $this->storeResolverMock = $this->getMockBuilder(StoreResolverInterface::class)
+ ->getMockForAbstractClass();
+ $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
+ ->getMockForAbstractClass();
+ $this->attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAttributeCode', 'getSource'])
+ ->getMockForAbstractClass();
+ $this->sourceMock = $this->getMockBuilder(AbstractSource::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAllOptions'])
+ ->getMockForAbstractClass();
- $this->model = new DefaultFrontend(
- $this->booleanFactory
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->model = $objectManager->getObject(
+ DefaultFrontend::class,
+ [
+ '_attrBooleanFactory' => $this->booleanFactory,
+ 'cache' => $this->cacheMock,
+ 'storeResolver' => $this->storeResolverMock,
+ 'serializer' => $this->serializerMock,
+ '_attribute' => $this->attributeMock,
+ 'cacheTags' => $this->cacheTags
+ ]
);
}
@@ -118,4 +179,39 @@ public function testGetClassLength()
$this->assertContains('maximum-length-2', $result);
$this->assertContains('validate-length', $result);
}
+
+ public function testGetSelectOptions()
+ {
+ $storeId = 1;
+ $attributeCode = 'attr1';
+ $cacheKey = 'attribute-navigation-option-' . $attributeCode . '-' . $storeId;
+ $options = ['option1', 'option2'];
+ $serializedOptions = "{['option1', 'option2']}";
+
+ $this->storeResolverMock->expects($this->once())
+ ->method('getCurrentStoreId')
+ ->willReturn($storeId);
+ $this->attributeMock->expects($this->once())
+ ->method('getAttributeCode')
+ ->willReturn($attributeCode);
+ $this->cacheMock->expects($this->once())
+ ->method('load')
+ ->with($cacheKey)
+ ->willReturn(false);
+ $this->attributeMock->expects($this->once())
+ ->method('getSource')
+ ->willReturn($this->sourceMock);
+ $this->sourceMock->expects($this->once())
+ ->method('getAllOptions')
+ ->willReturn($options);
+ $this->serializerMock->expects($this->once())
+ ->method('serialize')
+ ->with($options)
+ ->willReturn($serializedOptions);
+ $this->cacheMock->expects($this->once())
+ ->method('save')
+ ->with($serializedOptions, $cacheKey, $this->cacheTags);
+
+ $this->assertSame($options, $this->model->getSelectOptions());
+ }
}
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index 5d3b80d68a447..06d8610a247cc 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -20,15 +20,24 @@ class Export extends ExportController
*/
protected $fileFactory;
+ /**
+ * @var \Magento\Framework\Session\SessionManagerInterface
+ */
+ private $sessionManager;
+
/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+ * @param \Magento\Framework\Session\SessionManagerInterface $sessionManager [optional]
*/
public function __construct(
Context $context,
- FileFactory $fileFactory
+ FileFactory $fileFactory,
+ \Magento\Framework\Session\SessionManagerInterface $sessionManager = null
) {
$this->fileFactory = $fileFactory;
+ $this->sessionManager = $sessionManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Session\SessionManagerInterface::class);
parent::__construct($context);
}
@@ -45,6 +54,7 @@ public function execute()
$model = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
$model->setData($this->getRequest()->getParams());
+ $this->sessionManager->writeClose();
return $this->fileFactory->create(
$model->getFileName(),
$model->export(),
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 691677d6bcafb..9755772fbdeb5 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -56,7 +56,7 @@ if ($product->isSaleable()) {
$data = ['addToCart' => [
'origin'=> 'msrp',
'popupId' => '#' . $popupId,
- 'productName' => $product->getName(),
+ 'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
'productId' => $productId,
'productIdInput' => 'input[type="hidden"][name="product"]',
'realPrice' => $block->getRealPriceHtml(),
@@ -80,7 +80,7 @@ if ($product->isSaleable()) {
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index e61adcad58bdc..f440651af64d3 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -38,7 +38,7 @@
+