diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
index 4d5a811211bf75b81a1e983f740e43971fce604c..5e8589428fad1d17abe4480abf1d16a8b727abcb 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -13,8 +13,6 @@ namespace Magento\Catalog\Model\Category\Attribute\Backend;
class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
- const ADDITIONAL_DATA_PREFIX = '_additional_data_';
-
/**
* @var \Magento\MediaStorage\Model\File\UploaderFactory
*
@@ -48,6 +46,11 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
*/
private $imageUploader;
+ /**
+ * @var string
+ */
+ private $additionalData = '_additional_data_';
+
/**
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
@@ -92,7 +95,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
$value = $object->getData($attributeName);
if ($imageName = $this->getUploadedImageName($value)) {
- $object->setData(self::ADDITIONAL_DATA_PREFIX . $attributeName, $value);
+ $object->setData($this->additionalData . $attributeName, $value);
$object->setData($attributeName, $imageName);
} else if (!is_string($value)) {
$object->setData($attributeName, '');
@@ -124,7 +127,7 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
*/
public function afterSave($object)
{
- $value = $object->getData(self::ADDITIONAL_DATA_PREFIX . $this->getAttribute()->getName());
+ $value = $object->getData($this->additionalData . $this->getAttribute()->getName());
if ($imageName = $this->getUploadedImageName($value)) {
try {
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
index e49da3972e0a0c998d3511c524c3312be42afaa5..387e9a8a6a891b305170253befcd5cedb046feeb 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
@@ -10,7 +10,6 @@ use Magento\Framework\App\Request\Http as Request;
use Magento\Catalog\Model\ImageUploader;
use Magento\Framework\Controller\ResultFactory;
use Magento\Framework\DataObject;
-use Magento\Backend\App\Action\Context;
/**
* Class UploadTest
@@ -52,10 +51,8 @@ class UploadTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue(new DataObject()));
$model = $this->objectManager->getObject(Model::class, [
- 'context' => $this->objectManager->getObject(Context::class, [
- 'request' => $request,
- 'resultFactory' => $resultFactory
- ]),
+ 'request' => $request,
+ 'resultFactory' => $resultFactory,
'imageUploader' => $uploader
]);
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
index 58557e25d970b442fe1bdeaac494d7b215c64472..745d46710053a7c877e1bf05db47a715175b2bcb 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
@@ -18,11 +18,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
*/
private $resultRedirectFactoryMock;
- /**
- * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
- */
- private $resultRawFactoryMock;
-
/**
* @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -33,16 +28,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
*/
private $layoutFactoryMock;
- /**
- * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
- */
- private $contextMock;
-
- /**
- * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
- */
- private $titleMock;
-
/**
* @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -58,11 +43,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
*/
private $eventManagerMock;
- /**
- * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- private $responseMock;
-
/**
* @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -87,22 +67,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
- $this->contextMock = $this->getMock(
- \Magento\Backend\App\Action\Context::class,
- [
- 'getTitle',
- 'getRequest',
- 'getObjectManager',
- 'getEventManager',
- 'getResponse',
- 'getMessageManager',
- 'getResultRedirectFactory'
- ],
- [],
- '',
- false
- );
$this->resultRedirectFactoryMock = $this->getMock(
\Magento\Backend\Model\View\Result\RedirectFactory::class,
['create'],
@@ -110,13 +74,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->resultRawFactoryMock = $this->getMock(
- \Magento\Framework\Controller\Result\RawFactory::class,
- [],
- [],
- '',
- false
- );
$this->resultJsonFactoryMock = $this->getMock(
\Magento\Framework\Controller\Result\JsonFactory::class,
['create'],
@@ -152,12 +109,6 @@ class SaveTest extends \PHPUnit_Framework_TestCase
true,
['dispatch']
);
- $this->responseMock = $this->getMockForAbstractClass(
- \Magento\Framework\App\ResponseInterface::class,
- [],
- '',
- false
- );
$this->messageManagerMock = $this->getMockForAbstractClass(
\Magento\Framework\Message\ManagerInterface::class,
[],
@@ -168,23 +119,15 @@ class SaveTest extends \PHPUnit_Framework_TestCase
['addSuccess', 'getMessages']
);
- $this->contextMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock);
- $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
- $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
- $this->contextMock->expects($this->any())->method('getEventManager')->willReturn($this->eventManagerMock);
- $this->contextMock->expects($this->any())->method('getResponse')->willReturn($this->responseMock);
- $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
- $this->contextMock->expects($this->any())
- ->method('getResultRedirectFactory')
- ->willReturn($this->resultRedirectFactoryMock);
-
$this->save = $this->objectManager->getObject(
\Magento\Catalog\Controller\Adminhtml\Category\Save::class,
[
- 'context' => $this->contextMock,
- 'resultRawFactory' => $this->resultRawFactoryMock,
+ 'request' => $this->requestMock,
+ 'eventManager' => $this->eventManagerMock,
+ 'messageManager' => $this->messageManagerMock,
'resultJsonFactory' => $this->resultJsonFactoryMock,
- 'layoutFactory' => $this->layoutFactoryMock
+ 'layoutFactory' => $this->layoutFactoryMock,
+ 'resultRedirectFactory' => $this->resultRedirectFactoryMock
]
);
}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
index ce4cc93b0181b7e2a3002c8c103cb7ae247259ba..37d0751a81bc06cfb4672874fff20dfefab6cb72 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
@@ -22,21 +22,6 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
*/
private $category;
- /**
- * @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject
- */
- private $context;
-
- /**
- * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- private $eventManager;
-
- /**
- * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- private $cacheManager;
-
/**
* @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -140,22 +125,6 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
- $this->context = $this->getMock(
- \Magento\Framework\Model\Context::class,
- ['getEventDispatcher', 'getCacheManager'],
- [],
- '',
- false
- );
-
- $this->eventManager = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
- $this->context->expects($this->any())->method('getEventDispatcher')
- ->will($this->returnValue($this->eventManager));
- $this->cacheManager = $this->getMock(\Magento\Framework\App\CacheInterface::class);
- $this->context->expects($this->any())->method('getCacheManager')
- ->will($this->returnValue($this->cacheManager));
-
$this->registry = $this->getMock(\Magento\Framework\Registry::class);
$this->storeManager = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
$this->categoryTreeResource = $this->getMock(
@@ -366,7 +335,6 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
return $this->objectManager->getObject(
\Magento\Catalog\Model\Category::class,
[
- 'context' => $this->context,
'registry' => $this->registry,
'storeManager' => $this->storeManager,
'categoryTreeResource' => $this->categoryTreeResource,